Groups > linux.debian.maint.python > #7707

Re: git-dpm merge conflicts

From	Stefano Rivera <stefanor@debian.org>
Newsgroups	linux.debian.maint.python
Subject	Re: git-dpm merge conflicts
Date	2015-10-20 05:30 +0200
Message-ID	<qlvMC-8cU-1@gated-at.bofh.it> (permalink)
References	<qlunw-5Vc-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Brian (2015.10.20_03:54:40_+0200)
> When the following error occurs, how can I tell what patch it was
> attempting to apply at the time?

It's an aborted git rebase, so you should be able to:

git show HEAD

SR

-- 
Stefano Rivera
  http://tumbleweed.org.za/
  +1 415 683 3272

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Find similar

Thread

git-dpm merge conflicts Brian May <bam@debian.org> - 2015-10-20 04:00 +0200
  Re: git-dpm merge conflicts Stefano Rivera <stefanor@debian.org> - 2015-10-20 05:30 +0200

csiph-web