Hi,
I've already spent 2 hours on that problem and cannot seem to be able to
fix it.
I have a branch called my-commits where I put some generic useful
changes for me (http://github.com/badzil/My-Invenio/commits/my-commits).
Usually in order to update this branch with the latest changes in
Invenio, I do this:
# Go to master
git checkout master
# Get the latest changes
git pull
# Go to my commits branch
git checkout my-commits
# Rebase against master
git rebase master
Until today, it has always worked correctly. Because today I got that:
=========
First, rewinding head to replay your work on top of it...
HEAD is now at 20e96ad BibFormat: fixed MARCXML hidden fields filtering
Applying BibFormat: Exception handling
error: modules/bibformat/lib/Makefile.am: does not match index
error: modules/bibformat/lib/bibformat.py: does not match index
error: modules/bibformat/lib/bibformat_bfx_engine.py: does not match index
error: modules/bibformat/lib/bibformat_engine.py: does not match index
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
error: Entry 'modules/bibformat/lib/Makefile.am' not uptodate. Cannot merge.
fatal: merging of trees 56f676481c6c4c57f7c6c6508fb11946e87da923 and
e93cde8a770d06682f2b3d759dd56b85f54bee7e failed
Failed to merge in the changes.
Patch failed at 0001.
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".
=========
My branch does not have any uncommitted changes. "git status" returns
"working directory clean".
Any thoughts on that? Am I the only one to experience that?
Benoit.
