Emacs Tip #5 -- Resolving Merge ConflictsAfter performing an update using a version control system, you will sometimes have unresolved conflicts. Often these result in files with the two versions intermingled in a single file. While you can manually delete the unwanted text, emacs provides a better way.
So the next time you end up with a file filled with conflict markers you can quickly and easily clean it up to your liking.
Copyright © 2016 Andrew Oliver