Re: Git transition workflow

[Sergey Organov]

Stefan Monnier <address@hidden> writes:

>> 3. Merge conflicts, if any, as well as their resolution, are very
>>    similar in both workflows. The only difference is that one needs to
>>    learn to use "git rebase --continue" instead of "git commit" after
>>    conflicts are resolved.
>
> There's one big difference here: in the merge case, all the state is
> directly visible in the files,

Not exactly, as staging area does have some hidden state. That's why you
need to "git add" a file after you resolve conflicts (unlike CVS).

> whereas for rebase, some of the state is stashed away in the .git
> directory (hence the need to use "git rebase --continue" which fetches
> the leftover state and keeps on processing it).
>
> It definitely takes some getting used it.

Yes, indeed, it's unnatural to use "git rebase --continue" to continue
interrupted "git pull". But fundamentally rebase is just a sequence of 1
or more merges ( = the number of commits to rebase, so still exactly 1
merge for typical quick fix). Nothing very new.

-- 
Sergey.