Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

please help, I cant pull some codes

Queenie Garcia
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
April 7, 2022

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks fetch --no-tags origin

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks pull origin develop-copy-kent
From https://bitbucket.org/amielou/da11rsldms
* branch develop-copy-kent -> FETCH_HEAD

hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint: git config pull.rebase false # merge
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

1 answer

6 votes
Somesh Allu
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
September 7, 2022

@Queenie Garcia Try using Fast-Forward(--ff-only), simply check the 3rd CheckBox( Create a new commit even if fast-forward is possible ), this will merge the changes done by others and are existing in your branch into your working repository, this worked for me hope this will work for you as well.

Fast-Forward.png

Michael Dorogov
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
March 19, 2024

I tried to do it but it didn't help
I see the same problem
Problem.png

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events