Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

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

git-dpm merge conflicts

Show all headers | View raw

Hello,

When the following error occurs, how can I tell what patch it was
attempting to apply at the time?

In this particular case I can guess, however it occurred to me that
there had to be a better way...

git diff in this case shows upstream changes, not my changes. Possibly
because the changes have been applied upstream and the patch is a
NOP. Trying to work out what is going on without reference to the
original patch is somewhat confusing however.

Regards



git-dpm import-new-upstream --ptc --rebase-patched ../python-mkdocs_0.14.0.orig.tar.gz                                                                                         
Switched to a new branch 'patched'
Rebasing changes in 'patched' since '9c3e1c4fe92d2eb23173b4ee88efd8e603d859b9' onto 'upstream'...
First, rewinding head to replay your work on top of it...
Auto-merging mkdocs/themes/mkdocs/base.html
CONFLICT (content): Merge conflict in mkdocs/themes/mkdocs/base.html

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".

Once you finished rebase, don't forget to call update-patches


-- 
Brian May <bam@debian.org>

Back to linux.debian.maint.python | Previous | Next — Next 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