Geek Answers Handbook

Fatal error with `git rebase upstream-branch` in topic thread

I have a problem when I try to overload a branch upstream into a topic branch. The workflow is as follows:

git checkout upstream
git pull origin upstream
git checkout topic
git rebase upstream

The result is as follows:

First, rewinding head to replay your work on top of it...
Applying Refactored database access and added logging
error: patch failed: path/to/file1.ext:21
error: path/to/file1.ext: patch does not apply
error: path/to/file2.ext:3
error: path/to/file2.ext: patch does not apply
fatal: mode change for path/to/file3.ext, which is not in current HEAD
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001.

This happened to me yesterday, and I did my research and found nothing, so in the end I used git merge upstreaminstead git rebase upstream, and it worked. The real problem is that the error appears today. I am already in sync with the upflow due to yesterday's merger. Also, I did not modify the files submitted by my teammates from yesterday.

My version of Git is 1.5.6.5 (and I really don’t want to update it on this machine, I am afraid of undesirable consequences).

+4
2

, --merge . (Git rebase .)

+9

, , diff .

, : git log --grep ++

... , ..

0

More articles:


All Articles