From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
Cc: git@vger.kernel.org
Subject: Re: conflict resolution of pd/bash-4-completion [Re: What's cooking in git.git (Dec 2010, #05; Thu, 16)]
Date: Fri, 17 Dec 2010 11:24:46 -0800 [thread overview]
Message-ID: <7v1v5gjj7l.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: 20101217111856.GA9304@neumann
SZEDER Gábor <szeder@ira.uka.de> writes:
> On Thu, Dec 16, 2010 at 11:38:21PM -0800, Junio C Hamano wrote:
>> * pd/bash-4-completion (2010-12-15) 3 commits
>> - Merge branch 'master' (early part) into pd/bash-4-completion
>> - bash: simple reimplementation of _get_comp_words_by_ref
>> - bash: get --pretty=m<tab> completion to work with bash v4
>>
>> Updated by Jonathan; this still has some conflicts around "notes"
>> completion I tried to resolve near the tip of 'pu'.
>
> The resolution of that conflict is not quite correct. I'm not sure
> how I should send a proper conflict resolution... but I'll try
> anyway.
Thanks, this helped me quite a lot to update my rerere database, so that
the fix-up can be carried forward in future merges to 'next' and
eventually 'master'.
For anybody interested, here is how a merge fix-up patch like yours can be
used:
1. First apply to the commit it is intended to be applied:
$ git co pu
$ git am your-patch
2. Re-attempt the merge. CG stands for "Commit Goal".
$ CG=$(git rev-parse HEAD)
$ git reset --hard HEAD^^
$ git merge pd/bash-4-completion
3. Clear the rerere database and redo the merge, letting it conflict.
$ git rerere forget contrib/completion/git-completion.bash
$ git reset --hard
$ git merge pd/bash-4-completion
4. Take the fixup and conclude the merge; this updates the rerere
database.
$ git checkout $CG .
$ git commit
next prev parent reply other threads:[~2010-12-17 19:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-17 7:38 What's cooking in git.git (Dec 2010, #05; Thu, 16) Junio C Hamano
2010-12-17 11:18 ` conflict resolution of pd/bash-4-completion [Re: What's cooking in git.git (Dec 2010, #05; Thu, 16)] SZEDER Gábor
2010-12-17 19:24 ` Junio C Hamano [this message]
2010-12-18 22:00 ` What's cooking in git.git (Dec 2010, #05; Thu, 16) Ramsay Jones
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v1v5gjj7l.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=szeder@ira.uka.de \
/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 public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).