Click here to Skip to main content
14,835,749 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: How to use source control Pin
Clifford Nelson18-Apr-18 7:20
MemberClifford Nelson18-Apr-18 7:20 
GeneralRe: How to use source control Pin
Marc Clifton18-Apr-18 7:16
mvaMarc Clifton18-Apr-18 7:16 
GeneralRe: How to use source control Pin
StarNamer_19-Apr-18 4:43
professionalStarNamer_19-Apr-18 4:43 
GeneralRe: How to use source control Pin
Marc Clifton20-Apr-18 2:43
mvaMarc Clifton20-Apr-18 2:43 
GeneralRe: How to use source control Pin
decaffeinatedMonkey19-Apr-18 1:38
MemberdecaffeinatedMonkey19-Apr-18 1:38 
GeneralRe: How to use source control Pin
Slow Eddie19-Apr-18 3:11
professionalSlow Eddie19-Apr-18 3:11 
GeneralRe: How to use source control Pin
nightsoul9419-Apr-18 6:05
Membernightsoul9419-Apr-18 6:05 
GeneralRe: How to use source control Pin
Marc Clifton20-Apr-18 2:38
mvaMarc Clifton20-Apr-18 2:38 
nightsoul94 wrote:
Maybe you guys can clue me in.


The problem is more with the arcane syntax of the CL in Git or the obtuse wording. For example, in TFS, there are the terms "source branch" and "target branch" and I truly have no idea what "source" and "target" are referring to. While it sort of makes sense that "target" is the branch I'm merging to it never seems to do the right thing when merging conflicts.

Or in SmartGit "select the branch or commit to merge" - but I'm merging from one branch to another, so saying that doesn't give me any indication of whether I'm selecting the "from" or to the "to" branch.

And then the two options as buttons "Create Merge-Commit" and "Merge to Working Tree" - I have no idea what a Merge-Commit is, and even less what a "Working Tree" is, why there are these options, what they do, and what the implication is.

Basically, to figure this all out, I would have to set up a play project, create some branches, change some things, try out the variations, and figure out what it actually did.

Maybe my brain just isn't wired for all this. I have a visual concept of "the server" that has stuff, my "local" machine that has stuff, and all I want to do is say "get my local stuff onto the server stuff". Maybe I have branches locally, maybe the server has branches, at which point my head starts implode.
Latest Article - Building a Prototype Web-Based Diagramming Tool with SVG and Javascript

Learning to code with python is like learning to swim with those little arm floaties. It gives you undeserved confidence and will eventually drown you. - DangerBunny

Artificial intelligence is the only remedy for natural stupidity. - CDP1802

GeneralRe: How to use source control Pin
Daniel R. Przybylski19-Apr-18 9:40
MemberDaniel R. Przybylski19-Apr-18 9:40 
GeneralRe: How to use source control Pin
Marc Clifton20-Apr-18 2:28
mvaMarc Clifton20-Apr-18 2:28 
GeneralDARKNESS Pin
Marc Clifton18-Apr-18 1:30
mvaMarc Clifton18-Apr-18 1:30 
GeneralRe: DARKNESS Pin
W Balboos, GHB18-Apr-18 1:37
mveW Balboos, GHB18-Apr-18 1:37 
GeneralRe: DARKNESS Pin
CodeWraith18-Apr-18 2:25
MemberCodeWraith18-Apr-18 2:25 
GeneralRe: DARKNESS Pin
lopatir18-Apr-18 4:27
Memberlopatir18-Apr-18 4:27 
GeneralRe: DARKNESS Pin
W Balboos, GHB18-Apr-18 4:30
mveW Balboos, GHB18-Apr-18 4:30 
GeneralRe: DARKNESS Pin
lopatir18-Apr-18 5:09
Memberlopatir18-Apr-18 5:09 
GeneralRe: DARKNESS Pin
W Balboos, GHB18-Apr-18 5:48
mveW Balboos, GHB18-Apr-18 5:48 
GeneralRe: DARKNESS Pin
theoldfool18-Apr-18 5:43
professionaltheoldfool18-Apr-18 5:43 
GeneralRe: DARKNESS Pin
Mike Hankey18-Apr-18 2:34
professionalMike Hankey18-Apr-18 2:34 
GeneralRe: DARKNESS Pin
R. Giskard Reventlov18-Apr-18 4:30
MemberR. Giskard Reventlov18-Apr-18 4:30 
GeneralRe: DARKNESS Pin
Gary Wheeler18-Apr-18 6:24
MemberGary Wheeler18-Apr-18 6:24 
GeneralOi! Pom Pey! Pin
OriginalGriff17-Apr-18 23:08
mveOriginalGriff17-Apr-18 23:08 
GeneralRe: Oi! Pom Pey! Pin
megaadam17-Apr-18 23:42
professionalmegaadam17-Apr-18 23:42 
GeneralRe: Oi! Pom Pey! Pin
CodeWraith17-Apr-18 23:48
MemberCodeWraith17-Apr-18 23:48 
GeneralRe: Oi! Pom Pey! Pin
OriginalGriff17-Apr-18 23:48
mveOriginalGriff17-Apr-18 23:48 

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.