![]() When we merge the feature branch with the master branch, we will end up with a merge conflict error. There are two branches, master and feature, and each one is operating on the same file. We can understand this from the below diagram. Once the command is fired, we are back to the clean state i.e., the state before we started the merge. Note that if we execute this command after resolving some conflicts and staging the changes, then these changes would not be saved. To abort the merge, we can use the following command $ git merge -abort In situations like this we can easily go back to the state before we started the merge. Perhaps you have several conflicts and you don't have enough time to spend on resolving these conflicts. ![]() Now what if we are not quite ready to handle this conflict yet. When doing a merge, you may run into one or more conflicts. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |