Categories
General

How to resolve git merge – – not something we can merge ?

If you try something

git merge feature/the-feature-branch-XXX

and you see


merge: feature/the-feature-branch-XXX - not something we can merge

SOLUTION in 2 steps

step 1 : git checkout –track origin/feature/the-feature-branch-XXX

step 2 git checkout release/target_branch

step 3 (try again) : git mergefeature/the-feature-branch-XXX

Leave a Reply