When doing a merge while there is untracked files with the same name as merged files, git refuses to proceed. This patch make git overwrite files if their content are the same. We added a statement to check_ok_to_remove() (unpack-trees.c) with ie_modified() (read-cache.c) to test if the untracked file has the same content as the merged one. It seems to work well with all three o->result, o->dst_index and o->src_index, We are not sure of what is the usage of those three, did we used it properly? Our tests need some improvement, for example using test_commit, and testing more possibilities, it's not a real patch, just to comfirm if we are on the right track. The next idea is when it's a fastforward, attempt to merge the untracked file and the upstream version (like if the file had just been committed, but without introducing an extra commit). you can see this idea here: https://git.wiki.kernel.org/index.php/SmallProjectsIdeas#Be_nicer_to_the_user_on_tracked.2Funtracked_merge_conflicts Questions: The old behaviour was here for technical reasons? The new behavior that we introduce here become the default one? If the old behavior was important for some people or for some reasons, we can set a global variable to switch between the old and the new one. And if we define a global variable, should we print a warning to let users know that there is a new behavior when a merge is called and that he can switch between the old and new one. For some reason, test_commit make the merge not working like if it's the old behaviour of merge, I dont understand why ? Jonathan (1): Merge with untracked file that are the same without failure and test t/t7615-merge-untracked.sh | 79 ++++++++++++++++++++++++++++++++++++++ unpack-trees.c | 4 ++ 2 files changed, 83 insertions(+) create mode 100755 t/t7615-merge-untracked.sh -- 2.35.1.7.gc8609858e0.dirty
