Come for the products,
stay for the community

The Atlassian Community can help you and your team get more value out of Atlassian products and practices.

Atlassian Community about banner
4,367,325
Community Members
 
Community Events
168
Community Groups

devにプルが出来ない

Edited

普段devというブランチですがをマスターして、ここからブランチを作って作業しているの、そのdevに作業したブランチをプルしようとしたのですが、エラーメッセージが出てプルできません。

エラーメッセージは

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

1 accepted

0 votes
Answer accepted
Ben Atlassian Team Aug 28, 2022

Hey 小穴拓実,

Welcome to the Bitbucket Cloud community!

I have actually written a documentation article related to this which should allow you to fix your local commit history and push to your remote without issue:

https://confluence.atlassian.com/bbkb/fix-bitbucket-cloud-local-repository-commit-history-with-duplicated-or-divergent-commits-1141496086.html

Hope this helps.

Cheers!

- Ben (Bitbucket Cloud Support)

最終的にSourcetreeをバージョン4.1.1にダウングレードしたら解決しました!

回答ありがとうございます!

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
CLOUD
TAGS

Atlassian Community Events