Disable Git Rename Detection

问题:

1. I have a file, foo.txt
2. Create and checkout branch 'branch_A'
3. git mv foo.txt bar.txt followed by git add -A then git commit -m "renamed foo.txt"
4. Checkout master, git checkout master
5. remove foo.txt and commit.
6. Now merge branch_A, git merge branch_A

And with this, I get an merge conflict (rename/delete).

CONFLICT (rename/delete): Rename foo.txt->bar.txt in branch_A and deleted in HEAD

This makes sense and is what I'd expect. However, I'd like to know if there is a way for git merge to not detect renames, but instead treat them as added/deleted. In this case, I'd expect git to detect that foo.txt was deleted and simply add bar.txt. No conflict.

I've tried using -X rename-threshold, but it has not worked for me. I've tried thresholds 0 and 120 (a number above 100). What am I missing?

Thanks!

P.S. I'm also getting error: refusing to lose untracked file at... errors. What does this mean?

回答1:

Can you try with:

git merge -s resolve branch_A

Also, have you tried looking at similar questions here:

git rename/delete confusion

git divergent renaming

回答2:

With git 2.8 (March 2016), you will have another option (as an option to the recursive merge strategy)

git merge -Srecursive -Xno-renames

See commit 44c74ec, commit 2307211, commit 63651e1 (24 Feb 2016), commit 2307211, commit 63651e1 (24 Feb 2016), commit 87892f6, commit 83837ec (21 Feb 2016), and commit 1b47ad1, commit d2b11ec (17 Feb 2016) by Felipe Gonçalves Assis (asiz).
^{(Merged by Junio C Hamano -- gitster -- in commit 4ce064d, 26 Feb 2016)}

merge-recursive: option to disable renames

The recursive strategy turns on rename detection by default.
Add a strategy option to disable rename detection even for exact renames.

The man git-merge will include:

no-renames

Turn off rename detection.
See git diff --no-rename.

(Note, as seen in commit 1b47ad1, the find-renames merge strategy, following git diff interface, makes the option rename-threshold redundant starting with git 2.8)

---

You have an additional setting with Git 2.18 (Q2 2018): with the merge.renames configuration set to false, the recursive merge strategy can be told not to spend cycles trying to find renamed paths and merge them accordingly.

See commit 6f10a09, commit 85b4603, commit a7152e9 (02 May 2018) by Ben Peart (benpeart).
^{(Merged by Junio C Hamano -- gitster -- in commit 6e2ba77, 30 May 2018)}

merge: add merge.renames config setting

Add the ability to control rename detection for merge via a config setting.
This setting behaves the same and defaults to the value of diff.renames but only applies to merge.