Consider the following scenario:
- upstream repository with 2500 is stored in SVN
- git user A imports the repository into git and commits 1 patch
- git user B imports the repository into git and commits 1 patch
- git user A wants to merge the patch from git user B
In this case, if user A uses
git rebase -Xours
First, rewinding head to replay your work on top of it...
fatal: Could not parse object '98d7cd83de321e737b22240752cd178622d29406^'
Unknown exit code (128) from command: git-merge-recursive 98d7cd83de321e737b22240752cd178622d29406^ -- HEAD 98d7cd83de321e737b22240752cd178622d29406
git clone https://github.com/opentk/opentk
git remote add mono https://github.com/mono/opentk
git fetch mono
git checkout -b integrate
git rebase -Xours mono/rodo-consolidate-opentk
I had a similar issue with this error and I gave up
rebase, and instead used
cherry-pick to pick the changes, and it worked fine.