From: David Caldwell <david@porkrind.org>
To: Sergey Organov <sorganov@gmail.com>, emacs-devel@gnu.org
Subject: Re: Git transition workflow
Date: Wed, 13 Aug 2014 11:15:40 -0700 [thread overview]
Message-ID: <53EBAB4C.3080203@porkrind.org> (raw)
In-Reply-To: <lsfrvs$v3f$1@ger.gmane.org>
[-- Attachment #1: Type: text/plain, Size: 1686 bytes --]
On 8/13/14 7:16 AM, Sergey Organov wrote:
> Stefan Monnier <monnier@iro.umontreal.ca> 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.
>>
>> …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".
To git's credit, it at least prints that arcana out when you need it:
$ git pull --rebase ../b
remote: Counting objects: 3, done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From ../b
* branch HEAD -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: a
Using index info to reconstruct a base tree...
M a
Falling back to patching base and 3-way merge...
Auto-merging a
CONFLICT (content): Merge conflict in a
Failed to merge in the changes.
Patch failed at 0001 a
The copy of the patch that failed is found in:
/private/tmp/a/.git/rebase-apply/patch
> When you have resolved this problem, run "git rebase --continue".
> If you prefer to skip this patch, run "git rebase --skip" instead.
> To check out the original branch and stop rebasing, run "git rebase
> --abort".
-David
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4219 bytes --]
next prev parent reply other threads:[~2014-08-13 18:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 11:36 Git transition workflow Paul Michael Reilly
2014-08-12 2:28 ` Stephen J. Turnbull
2014-08-12 2:58 ` Eric S. Raymond
2014-08-12 4:09 ` Paul Michael Reilly
2014-08-12 4:14 ` Eric S. Raymond
2014-08-12 3:16 ` Richard Stallman
2014-08-12 8:07 ` Rüdiger Sonderfeld
2014-08-12 8:33 ` Jan Nieuwenhuizen
2014-08-12 19:13 ` Achim Gratz
2014-08-13 3:59 ` Stephen J. Turnbull
2014-08-13 4:14 ` Ashton Kemerling
2014-08-13 10:30 ` Sergey Organov
2014-08-13 12:52 ` Stefan Monnier
2014-08-13 14:16 ` Sergey Organov
2014-08-13 15:59 ` Stefan Monnier
2014-08-13 18:15 ` David Caldwell [this message]
2014-08-13 16:17 ` Stephen J. Turnbull
2014-08-13 16:28 ` John Yates
2014-08-13 17:16 ` Stephen J. Turnbull
2014-08-13 17:20 ` Achim Gratz
2014-08-13 18:34 ` Stephen J. Turnbull
2014-08-13 21:09 ` Sergey Organov
2014-08-14 10:44 ` Michael Mattie
2014-08-13 3:56 ` Richard Stallman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53EBAB4C.3080203@porkrind.org \
--to=david@porkrind.org \
--cc=emacs-devel@gnu.org \
--cc=sorganov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.