How To Undo A Conflicting Merge in GIT

Published Date Author: , Posted June 8th, 2021 at 11:11:18am

shell> git merge branch-with-messy-changes

shell> git status

shell> git merge --abort

shell> git status

IMPORTANT NOTE: Previous versions of git used different commands for this operation:

Latest version: git merge --abort
Older than version 1.7.4: git reset --merge
Older than version 1.6.2: git reset --hard

No comments as yet.

Leave Your Comment  Leave a comment

All fields marked with "*" are required.