Geek Answers Handbook

GIT creating external HEAD files during rebase

Running a problem that I never saw when rebooting.

I have a master branch that has some fixes.

I have a dev branch that used to disconnect from the wizard before patching.

I go to the dev branch and then run:

git rebase master

It rewinds and tries to play dev changes.

The permutation stops, I get a conflict that I have to resolve.

I resolved the normal conflict, added the resolved file and ran:

 git rebase --continue

There is another conflict, and I run:

 git status

.. see the state of things. I see some normal changes, some unrelated paths, but then also some crack-free files that I had never seen before:

 path/to/something/existingFileName.ext~HEAD

I can look back and see that these files did not exist in any of the branches at the time of the commit, to which we returned. I wonder why they were created by the reinstallation process, and what if something is done with them?

+7
git git-rebase rebase
source share
1 answer

These are the files that he uses to coordinate the merger: yours, them, and what we started with. After you resolve the conflict and run git rebase --continue and do it, are they still there?

+1
source share

More articles:


All Articles