0

I have 2 branches

  • Develop
  • Refactor

In the "Refactor" branch I moved a file. For our example is "Home/Home.txt" to "Main/Home.txt"

I have not finished my refactor, that I have a new feature to develop in the "develop" branch in the "Home/Home.txt" file, so I make the changes.

Then I want to go back to my refactor, and to avoid accumulating conflicts I merge Develop to Refactor

And I have a conflict:

  • In Develop there is "Home/Home.txt" and not in Refactor (because it was moved), so it proposes me or keep the file or let it "deleted" (because in Refactor it is not at this place. So I can not see the change of the file because it seems there is no reference? git does not make the link between "Home/Home.txt" and "Main/Home.txt"

How to do?

Mickael Belhassen
  • 2,394
  • 1
  • 21
  • 37
  • this can help ? https://stackoverflow.com/questions/2314652/is-it-possible-to-move-rename-files-in-git-and-maintain-their-history – thchp Sep 23 '21 at 13:55

0 Answers0