6/20/2023 0 Comments Diffmerge git conflictIt’s time to demystify those little buggers and get to know them better. Let’s see what a conflict really looks like under the hood. What merge conflicts really look like in Git You can always abort, return to a clean state, and start over. This should give you the confidence that you really can’t mess up. This also works when you’ve already started resolving the conflicted files and, even then, when you find yourself at a dead end, you can still undo the merge. This will undo the merge/rebase and bring back the state before the conflict occurred. in commands like git merge -abort and git rebase -abort. In many cases, this is as simple as using the -abort parameter, e.g.
0 Comments
Leave a Reply. |