Editing 1597: Git
Warning: You are not logged in. Your IP address will be publicly visible if you make any edits. If you log in or create an account, your edits will be attributed to your username, along with other benefits.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 36: | Line 36: | ||
* attempting to recover from a situation such as an accidental merge, and making the situation worse. | * attempting to recover from a situation such as an accidental merge, and making the situation worse. | ||
β | In a | + | In a stiuation such as a merge conflict, Git will show an error message such as: |
CONFLICT (modify/delete): README.md deleted in HEAD and modified in branch-b. Version branch-b of README.md left in tree. | CONFLICT (modify/delete): README.md deleted in HEAD and modified in branch-b. Version branch-b of README.md left in tree. |