[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: git-dpm merge conflicts



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


Reply to: