From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Robin Rosenberg <robin.rosenberg.lists@dewire.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Govind Salinas <govind@sophiasuchtig.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 1/4] Introduce commit notes
Date: Sat, 20 Dec 2008 03:23:04 -0500 [thread overview]
Message-ID: <20081220082304.GA5693@coredump.intra.peff.net> (raw)
In-Reply-To: <7vk59vz2dx.fsf@gitster.siamese.dyndns.org>
On Sat, Dec 20, 2008 at 12:17:46AM -0800, Junio C Hamano wrote:
> > 1. git am /the/patch
> > 2. patch -p1 <.git/rebase-apply/patch
> > 3. manually inspect the results for sanity, and fix up the cache.h
> > bit that failed totally
> > 4. git add -u && git add notes.[ch]
> > 5. git am --resolved
>
> I usually skip 2-4 and edit .git/rebase-apply/patch in place instead, and
> run "git am" instead of step 5.
How do you track down the source of the conflict to do the patch fixup?
In this case, it was a context line in the patch that had been deleted
in my version. Do you just find the appropriate chunk in what you have
already and visually compare?
-Peff
next prev parent reply other threads:[~2008-12-20 8:24 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-16 8:15 Git Notes idea Govind Salinas
2008-12-16 8:51 ` Jeff King
2008-12-16 8:53 ` Jeff King
2008-12-16 18:43 ` Govind Salinas
2008-12-16 23:48 ` Johannes Schindelin
2008-12-17 9:45 ` Jeff King
[not found] ` <5d46db230812161815s1c48af9dwc96a4701fb2a669b@mail.gmail.com>
[not found] ` <alpine.DEB.1.00.0812170420560.14632@racer>
2008-12-17 10:11 ` Jeff King
2008-12-17 11:38 ` Johannes Schindelin
2008-12-17 19:20 ` Junio C Hamano
2008-12-18 3:08 ` Johannes Schindelin
2008-12-19 17:42 ` Govind Salinas
2008-12-19 17:18 ` Govind Salinas
2008-12-19 17:38 ` Govind Salinas
2008-12-19 21:25 ` Jeff King
2008-12-19 22:24 ` Govind Salinas
2008-12-20 4:54 ` Jeff King
2008-12-17 12:21 ` Petr Baudis
2008-12-17 9:38 ` Jeff King
2008-12-17 17:06 ` Govind Salinas
2008-12-18 13:54 ` Jeff King
2008-12-17 0:12 ` rebasing commits that have notes, was " Johannes Schindelin
2008-12-17 9:15 ` Johan Herland
2008-12-17 17:55 ` Stephan Beyer
2008-12-19 23:34 ` [PATCH 0/4] Notes reloaded Johannes Schindelin
2008-12-19 23:35 ` [PATCH 1/4] Introduce commit notes Johannes Schindelin
2008-12-20 6:53 ` Jeff King
2008-12-20 7:55 ` Robin Rosenberg
2008-12-20 8:05 ` Jeff King
2008-12-20 8:17 ` Junio C Hamano
2008-12-20 8:23 ` Jeff King [this message]
2008-12-20 20:09 ` Junio C Hamano
2008-12-20 12:04 ` [PATCH v2 0/4] Notes, reloaded Johannes Schindelin
2008-12-20 12:05 ` [PATCH v2 1/4] Introduce commit notes Johannes Schindelin
2008-12-20 12:05 ` [PATCH v2 2/4] Add a script to edit/inspect notes Johannes Schindelin
2008-12-20 12:05 ` [PATCH v2 3/4] Speed up git notes lookup Johannes Schindelin
2008-12-20 12:06 ` [PATCH v2 4/4] Add an expensive test for git-notes Johannes Schindelin
2008-12-19 23:35 ` [PATCH 2/4] Add a script to edit/inspect notes Johannes Schindelin
2008-12-19 23:35 ` [PATCH 3/4] Speed up git notes lookup Johannes Schindelin
2008-12-19 23:37 ` [PATCH 4/4] Add an expensive test for git-notes Johannes Schindelin
2008-12-19 23:49 ` Boyd Stephen Smith Jr.
2008-12-20 11:51 ` Johannes Schindelin
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=20081220082304.GA5693@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=govind@sophiasuchtig.com \
--cc=robin.rosenberg.lists@dewire.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.
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 NNTP newsgroup(s).