(use 'git merge -abort' to abort the merge) When you try to merge your branch, Git accuses a file conflict: Imagine also that you and your colleague are working in parallel on the same file, editing the same part of the file (or even the same lines), but your colleague merged his john branch into the master branch before you. When you are finished, you merge your branch into the master branch. While you are developing a feature, you commit to your branch. In addition to the master branch, each developer has their own branch (e.g. Imagine that you and a coworker are working on a development project and the team use a Git repository to store the source code. Merging and resolving conflictsīefore going to the tip itself, to make sure that everyone is on the same page, let’s see how commonly git merge is used, conflicts happen and are solved. Today we are going to take a look at two of them: the Atom text editor and the Meld diff and merge tool. Here is a tip for developers using Git: have you ever had a hard time merging branches? Did you know that there are GUI tools to resolve conflicts? They can make your job a lot easier.

Install meld linux