Jeff King <peff@xxxxxxxx> writes: > 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? Old fashioned way, by looking at the patch and the file that the patch is supposed to apply and reading the contexts. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
