Forum

Git Issue: Need to Specify how to reconcile divergent branches.

0
Topic starter

You may get this issue when taking a pull from the master.

2 Answers
1

https://stackoverflow.com/questions/11646107/you-have-not-concluded-your-merge-merge-head-exist s”> https://stackoverflow.com/questions/11646107/you-have-not-concluded-your-merge-merge-head-exists

check this solution

 

if this solution does not work then try below solution

git config pull.rebase false

run this command and then pull from master

This post was modified 7 months ago by Lps75
0
Topic starter

In such cases run

git config pull.rebase false

and then try to take a pull from the master. It will work.