Geek Answers Handbook

Bitbucket Unable to merge Unrelated branches

I have a repository (say A) and a forked A-dev repository on a bitbucket. Everything went well, 3 months. But recently, when I tried to create a pull request in A-dev, it says:

Unable to merge Unrelated branches

Why does this happen and how can this be solved? Anyway, to fix this problem?

Thanks. EDIT the screenshot of the error

+8
source share
2 answers

This means that merge conflicts will occur if he tries to merge. You must unite in "Repo A" and resolve conflicts. Then return to BitBucket to close the retrieval request. Workflow example:

git remote add repo_a https://url.com/path/to/repo git fetch repo_a git merge repo_a/dev # resolve conflicts git commit -am "Merge in repo_a/dev and resolved conflicts" git push origin dev

If you've never encountered merge conflicts in Git, check out this SO question .

+6
source

Try:

 git rebase origin/[BRANCH-NAME]
+3
source

More articles:


All Articles