I am somewhat confused what local / remote version means for git gui. At times remotes are my changes and at others local are. Is there any logic behind this naming/handling?
Asked
Active
Viewed 511 times
1
-
Are you asking what local & remote in git is, in general? – brokenfoot Mar 03 '14 at 08:35
-
I know what local branches, etc. are in contrast to remote ones. That said - local and remote without any context - I have no idea. – abergmeier Mar 03 '14 at 08:55
1 Answers
1
It would depends where, on git-gui you see "local" and "remote".
The only aspect of git where those two terms reference different changes is on a diff view, where local and remote are reversed during a rebase.
See "git rebase, keeping track of 'local' and 'remote'"
A rebase switches
ours(current branch before rebase starts) andtheirs(the upstream branch on top you want to rebase).
In a GUI mergetool context:
localreferences the partially rebased commits: "ours" (the upstream branch)remoterefers to the incoming changes: "theirs" - the current branch before the rebase.
