For example, -m 2 will make Git revert to the first parent from where. Finally, also make sure to provide the correct commit hash: for the git reset example above, we had to provide the commit before the merge when using git revert, however, we have to specify the actual merge commit's hash. You order Git to revert to the first parent of the master branch merge commit with -m 1.The -m 1 option tells Git that we want to keep the parent side of the merge (which is the branch we had merged into).That's also the reason why git revert is a better solution in cases where you've already pushed to a remote. Because the merge is a commit that points the HEAD to a specific commit, we can undo the merge commit and roll back to the pre-merge state. This is in contrast to git reset, where we effectively "remove" a commit from the history. It predates hosting services such as GitHub and what it does is generate a list of changes in the format of a patch file which gets sent by email. git revert will make sure that a new commit is created to revert the effects of that unwanted merge. (To make things slightly more confusingbecause, why notGit does offer a command called request-pull.0:00 - The problem 0:20 - git reset 0:43 - git reset -soft 0:59 - git revert Two commands shown in this video are: 1.
UNDO MERGE GIT HOW TO
Let's take a closer look at what this command will do: This video shows how to undo git merge commits. In such a case, when you've already shared the merge commit with your colleagues on a remote, you should consider a different solution. However, you will need to know what SHA to reset. The example from above is useful when you have NOT already pushed the merge to a remote repository. A reset is the simplest option as it will undo both the merge commit and any commits added from the branch. In case you are using the Tower Git client, undoing a merge is really simple: just press CMD+Z afterwards and Tower will undo the merge for you!
0 kommentar(er)
