Skip to content

Tag: gitlab

Cannot pull origin dev due to unrelated conflict in Git

I pull a branch (let’s say issue-100) from origin for review and after review I switched to local dev branch without modifying this issue-100 branch. There are some conflicts with this branch, but I did not touch it and just create a new branch after pulling dev branch from origin. But, interestingly, Git gives “Automatic merge failed; fix conflicts and