[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git transition workflow
From: |
Sergey Organov |
Subject: |
Re: Git transition workflow |
Date: |
Wed, 13 Aug 2014 18:16:22 +0400 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) |
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.
- Re: Git transition workflow, (continued)
Re: Git transition workflow, Richard Stallman, 2014/08/11
- Re: Git transition workflow, RĂ¼diger Sonderfeld, 2014/08/12
- Re: Git transition workflow, Jan Nieuwenhuizen, 2014/08/12
- Re: Git transition workflow, Achim Gratz, 2014/08/12
- Re: Git transition workflow, Stephen J. Turnbull, 2014/08/13
- Re: Git transition workflow, Ashton Kemerling, 2014/08/13
- Re: Git transition workflow, Sergey Organov, 2014/08/13
- Re: Git transition workflow, Stefan Monnier, 2014/08/13
- Re: Git transition workflow,
Sergey Organov <=
- Re: Git transition workflow, Stefan Monnier, 2014/08/13
- Re: Git transition workflow, David Caldwell, 2014/08/13
Re: Git transition workflow, Stephen J. Turnbull, 2014/08/13
Re: Git transition workflow, John Yates, 2014/08/13
Re: Git transition workflow, Stephen J. Turnbull, 2014/08/13
Re: Git transition workflow, Achim Gratz, 2014/08/13
Re: Git transition workflow, Stephen J. Turnbull, 2014/08/13
Re: Git transition workflow, Sergey Organov, 2014/08/13
Re: Git transition workflow, Michael Mattie, 2014/08/14
Re: Git transition workflow, Richard Stallman, 2014/08/12