#git #merge #conflict

Git merge your branch into other branch – Merge Conflict

Every time you have finished programming your ticket you try to merge your branch back into the dev branch. The dev branch may have changed in the meantime due to changes from other developers. If you have worked on the same file as the other developers, it can happen that automatic merging is not possible. Then you get the message: “Can´t resolve conflicts”.
Subscribe to #git #merge #conflict