Checking a section adds it to the Output at the bottom so you can see the options in context to decide which makes the most sense to commit. The Merge Tool output is at the bottom.Įach conflict section has a checkbox. The current branch is on the left, and the target branch that you’re merging into is shown on the right. If your merge attempt triggers a merge conflict, GitKraken Client display the conflicting files in the Commit Panel.Ĭlicking a conflicted file opens the Merge Tool. When collaboration goes wrong, GitKraken Client Merge Conflict Editor is here to clear the murky waters. Merge conflicts may happen when team members make different changes to the same line of the same file, or when one team member edits a file and another deletes the same file.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |