Geek asks and answers

Git revert creates a conflict "deleted by us" due to renaming

I am trying to undo a commit that changed a file that has since been renamed.

A modified file is usually called bin/internal/call_parser.rb, and currently it is called lib/call_parser.rb, and I get in my status after trying to make a return

$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 16 commits.
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#   modified:   other/unrelated/file
#
# Unmerged paths:
#   (use "git reset HEAD <file>..." to unstage)
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#   deleted by us:      bin/internal/call_parser.rb
#

As far as I can tell, the current version of lib / call_parser.rb and the subsequent version of bin / internal / call_parser.br should be similar enough for git to detect common content (I 'git works with file content, not file names) . How can I tell git to work harder to detect renaming and therefore return to content in lib / call_parser.rb?

+5
source share
1
git mv lib/call_parser.rb bin/internal/call_parser.rb
# Do the revert
git mv bin/internal/call_parser.rb lib/call_parser.rb

, , (TM).

+2

More articles:


All Articles