Click here to Skip to main content
15,919,422 members

Welcome to the Lounge

   

For discussing anything related to a software developer's life but is not for programming questions. Got a programming question?

The Lounge is rated Safe For Work. If you're about to post something inappropriate for a shared office environment, then don't post it. No ads, no abuse, and no programming questions. Trolling, (political, climate, religious or whatever) will result in your account being removed.

 
GeneralRe: Why is Git so complicated? Pin
den2k887-Jun-18 0:11
professionalden2k887-Jun-18 0:11 
GeneralRe: Why is Git so complicated? Pin
Marc Clifton7-Jun-18 1:42
mvaMarc Clifton7-Jun-18 1:42 
GeneralRe: Why is Git so complicated? Pin
F-ES Sitecore7-Jun-18 1:43
professionalF-ES Sitecore7-Jun-18 1:43 
GeneralRe: Why is Git so complicated? Pin
dandy728-Jun-18 7:34
dandy728-Jun-18 7:34 
GeneralRe: Why is Git so complicated? Pin
Maximilien7-Jun-18 3:23
Maximilien7-Jun-18 3:23 
GeneralRe: Why is Git so complicated? Pin
RichardGrimmer7-Jun-18 4:19
RichardGrimmer7-Jun-18 4:19 
GeneralRe: Why is Git so complicated? Pin
RandyBuchholz7-Jun-18 6:01
RandyBuchholz7-Jun-18 6:01 
GeneralRe: Why is Git so complicated? Pin
Jon McKee7-Jun-18 7:48
professionalJon McKee7-Jun-18 7:48 
I used TortoiseSVN before moving to git. It's weird and a bit nonsensical at first but it has reasons. Basically everything revolves around branching and merging[^]. Once those make sense everything else starts to fall into place.

Another[^] good article that might help. Patch branching to resolve conflicts will inevitably be useful to you at some point Thumbs Up | :thumbsup:

EDIT: To answer your question: The main reason you branch every new feature is to allow flexibility. For example, say you're coding a new feature. You get a call, "OMG, YOU NEED TO HOTFIX THIS PRODUCTION BUG ASAP, THINGS ARE BLOWING UP!!!" You can easily branch a hotfix, test it, and merge it to production. Your feature branch has had no impact on production yet. Now you go back to your feature branch, finish it, test it, then merge it into production. Easy. And yes, the hotfix is still there because git uses a 3-way merge (source, destination, ancestor). As long as the code the hotfix changed wasn't also changed in your feature branch, you won't have any issues. If it was you can use the patch branching technique to choose which code to keep.

modified 7-Jun-18 14:17pm.

GeneralRe: Why is Git so complicated? Pin
Sander Rossel7-Jun-18 8:41
professionalSander Rossel7-Jun-18 8:41 
GeneralWSO CCC OTD 2018-05-07 Pin
OriginalGriff6-Jun-18 21:58
mveOriginalGriff6-Jun-18 21:58 
GeneralRe: WSO CCC OTD 2018-05-07 Pin
PeejayAdams6-Jun-18 22:11
PeejayAdams6-Jun-18 22:11 
GeneralRe: WSO CCC OTD 2018-05-07 We have a winner! Pin
OriginalGriff6-Jun-18 22:30
mveOriginalGriff6-Jun-18 22:30 
PraiseRe: WSO CCC OTD 2018-05-07 We have a winner! Pin
LabVIEWstuff7-Jun-18 0:40
LabVIEWstuff7-Jun-18 0:40 
GeneralRe: WSO CCC OTD 2018-05-07 We have a winner! Pin
OriginalGriff7-Jun-18 1:13
mveOriginalGriff7-Jun-18 1:13 
GeneralWell, Peter Stringfellow pegged it Pin
Munchies_Matt6-Jun-18 21:53
Munchies_Matt6-Jun-18 21:53 
GeneralRe: Well, Peter Stringfellow pegged it Pin
Richard MacCutchan6-Jun-18 21:58
mveRichard MacCutchan6-Jun-18 21:58 
GeneralRe: Well, Peter Stringfellow pegged it Pin
OriginalGriff7-Jun-18 2:22
mveOriginalGriff7-Jun-18 2:22 
GeneralWhere do I want to go today? Pin
CodeWraith6-Jun-18 20:37
CodeWraith6-Jun-18 20:37 
GeneralRe: Where do I want to go today? Pin
the goat in your machine6-Jun-18 20:58
the goat in your machine6-Jun-18 20:58 
GeneralRe: Where do I want to go today? Pin
CodeWraith6-Jun-18 21:11
CodeWraith6-Jun-18 21:11 
GeneralRe: Where do I want to go today? Pin
Jon McKee6-Jun-18 21:21
professionalJon McKee6-Jun-18 21:21 
GeneralCoding Challenge in Q&A Pin
Patrice T6-Jun-18 11:38
mvePatrice T6-Jun-18 11:38 
GeneralAll those accounts... Pin
Sander Rossel6-Jun-18 9:23
professionalSander Rossel6-Jun-18 9:23 
GeneralRe: All those accounts... Pin
Clifford Nelson6-Jun-18 10:15
Clifford Nelson6-Jun-18 10:15 
GeneralRe: All those accounts... Pin
raddevus6-Jun-18 16:11
mvaraddevus6-Jun-18 16:11 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Praise Praise    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.