[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Git transition workflow

From: Stefan Monnier
Subject: Re: Git transition workflow
Date: Wed, 13 Aug 2014 08:52:41 -0400
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux)

> 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, 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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]