How to accept all my changes, or all their changes in a magit manual merge?

StackOverflow https://stackoverflow.com/questions/17643071

  •  03-06-2022
  •  | 
  •  

Question

In magit during a manual merge, sometimes there are files with many changes and I want to accept either all my changes, or all the changes in the other branch, rather than select them one by one. Is there a way to do that within magit, or if not from the git command line?

Was it helpful?

Solution

Yes, for one file during the merge you can:

git checkout good_revision file
Licensed under: CC-BY-SA with attribution
Not affiliated with StackOverflow
scroll top