2

After doing a git pull I'm getting a bunch of conflicts across ~100 files. I want the recently pulled changes to overwrite my own code.

I found this answer which seems similar to what I'm trying to do. But when I use:

git merge -s recursive -X theirs

It results in:

Merging is not possible because you have unmerged files.

I can run mergetool and go through each file individually but I already know I want to favor the new changes for everything.

I try to discard the merge and pull again with the following:

git merge --abort

git subtree pull --prefix=interactives/d2l/ https://mygiturl.com master --squash

But everytime I pull I get the conflict.

Community
  • 1
  • 1
Philip Kirkbride
  • 21,381
  • 38
  • 125
  • 225

1 Answers1

1

the message means that you already have leftovers from previous merge attempt. You should reset it by calling git merge --abort and try whatever you planned to do

max630
  • 8,762
  • 3
  • 30
  • 55