git merge: Removing files I want to keep!

How can you merge two branches in git, retaining necessary files from a branch?

When merging two branches, if a file was deleted in one branch and not in another, the file is ultimately deleted.

For example:

  • A file exists in master when you make a new branch
  • you remove the file from master since we don't need it (yet)
  • you make changes in the branch to add a feature, which relies on the file existing
  • you make bug fixes in master (cannot be discarded)
  • you merge some day, and the file is gone!

How to Reproduce:

  1. Create a git repo with one file.

    git init
echo "test" > test.txt
git add .
git commit -m "initial commit"

  2. Create a branch

    git branch branchA

  3. Delete the file in master

    git rm test.txt
git commit -m "removed file from master"

  4. Make ANY changes in branchA that don't touch the deleted file (it has to be unchanged to avoid Conflict)

    git checkout branchA
touch something.txt
git add .
git commit -m "some branch changes"

From here, any way I've found to merge these two branches, the test.txt file is deleted. Assuming we were relying on the file for branchA, this is a big problem.

Failing examples:

Merge 1

git checkout branchA
git merge master
ls test.txt

Merge 2

git checkout master
git merge branchA
ls test.txt

Rebase 1

git checkout branchA
git rebase master
ls test.txt
77165 次浏览
小开
最佳答案

This is an interesting issue. Because you deleted the file after BranchA was created, and then are merging master into BranchA, I'm not sure how Git would be able to realize there is a conflict.

After the bad merge you can undo, and then re-merge, but add back the file:

git checkout HEAD@{1} .
git merge --no-commit master
git checkout master test.txt
git add test.txt
git commit
小开

For a quick fix in this case, "git revert" the commit that deleted the file.

When this situation comes up in the future, the better way to handle it is to ensure that the creation of the new file happens on the branch. Then it gets added on master when you merge, but you don't have the file lying around in master in the meantime.

小开

You need to modify the file in the branch, so that there's a merge conflict with the delete in the trunk.

The exact same thing will happen if you, for example, delete a declaration for something in a headerfile in the trunk (because nothing needs it), and add a dependency on that declaration to some non-header file(s) in the branch. When you merge, since the branch doesn't touch (that part of) the header, it will just delete the declaration and things will break.

Whenever you have stuff in multiple places that is interdependent and needs to be kept in sync, its very easy for a merge to silently introduce problems. Its just one of the things you have to know about and check when merging. Ideally, you use compile-time asserts or other build time checks that will make any failures immediately apparent.

小开

Casey's example didn't work for my case - I couldn't checkout test.txt from master, because it was no longer in that branch:

$ git checkout master test.txt
error: pathspec 'test.txt' did not match any file(s) known to git.

Happily I could pull the file out of branchA's own HEAD:

$ git checkout branchA
$ git merge --no-commit master
$ git checkout HEAD test.txt
$ git add test.txt
$ git commit
小开

My solution to this was to simply modify the files I needed to keep (added a comment which was needed anyway) and commit those changes on the target branch, thus generating a merge conflict which could easily be resolved with a git add and a normal commit.

My history went something like this. Branch names have been changed to protect the innocent.

  1. create and commit files for a new feature to master
  2. realize this addition going to be more involved than originally planned, thus, branched to feature_branch
  3. Removed files from master so as not to disrupt normal workflow with RBs and such
  4. Time passes, more commits on master, none on feature_branch
  5. Resume work on the feature, git merge master on feature_branch causes original files to be removed (of course), git reset --hard to before the merge
  6. Applied the solution described above
小开

Same issue with git. Was working on a feature in a branch, then my job decided to sideline the feature for later. Thus the relevant feature files were deleted from master branch to allow app deployment without unnecessary files ... for the time being. Now my job needs me to finish the old feature and when I try to merge or rebase the old branch into the current master it deletes the files I need.

The quick solution is: Modify the files you need to keep in your feature branch, add and commit, and then merge with your master. This will now cause a merge conflict as opposed to deletion mode when merging. Now you can keep "our" changes to the files.

The problem is git sees the file deletion in HEAD as not being changed and will default into deletion mode. Specifically: deleted in master and modified in HEAD is outputted after you modify the files you need.

Reproduce the solution:

  1. Reset a branch to the older version with deleted files: git reset --hard origin/old_branch
  2. Modify the files you need to keep. Do not leave them the same.
  3. Merge your current master into the feature branch: git merge master

Automatic merge failed; fix conflicts and then commit the result.

  1. Keep "our" changes when fixing conflicts.
  2. git add . and git commit -m "fix deleted HEAD"
  3. Finish merging: git merge master
小开

Instead reversing merging, you could checkout file(s) from just before commit into your current merged branch (user Todd's suggestion):

  git checkout <commit hash or branch name> -- path/to/file

For example,

  git checkout 08ac9cf08f -- classify.cpp

and then you could push your branch.


提交答案