Git: Resolve a merge conflict
A short, tested Git example for resolve a merge conflict. Copy it and adjust the names and paths for your project.
Git
# edit the files, remove <<<<<<< ======= >>>>>>> markers, then:
git add path/to/file
git merge --continue # or: git rebase --continue
git merge --abort # give up and go backFind it in Zest
Search for “git resolve a merge conflict” in Zest and this example appears above the results, with other matches to choose from. Searches stay private.