CODEWITHSUNDEEP
gitemacsmagit
justinhj
justinhj

Reputation: 11306

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

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?

Upvotes: 1

Views: 385

Answers (1)

cforbish
cforbish

Reputation: 8819

Yes, for one file during the merge you can:

git checkout good_revision file

Upvotes: 1

Related Questions