Revisions to How to merge when you get error "Hint: You have divergent branches and need to specify how to reconcile them."

Second iteration. Explicit syntax highlighting hints (as a result, the diff looks more extensive than it really is - use view "Side-by-side Markdown" to compare).

Source Link

edited May 3 at 0:58

Peter Mortensen

31.4k
22
110
134

I had this issue using Visual Studio, and the following command solved it for me:

git config pull.rebase false

git config pull.rebase false

I had this issue using Visual Studio, and the following command solved it for me:

git config pull.rebase false

I had this issue using Visual Studio, and the following command solved it for me:

git config pull.rebase false

Active reading [<https://en.wikipedia.org/wiki/Sentence_clause_structure#Run-on_sentences>].

Source Link

edited May 3 at 0:52

Peter Mortensen

31.4k
22
110
134

I had this issue using Visual Studio -, and the following command solved it for me:

 git config pull.rebase false

I had this issue using Visual Studio - the following command solved it for me

 git config pull.rebase false

I had this issue using Visual Studio, and the following command solved it for me:

git config pull.rebase false

Source Link

answered May 13, 2022 at 15:04

JGilmartin

9.4k
14
72
90

I had this issue using Visual Studio - the following command solved it for me

 git config pull.rebase false

Collectives™ on Stack Overflow

Return to Answer