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

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

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
Atlassian Team members are employees working across the company in a wide variety of roles.
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
AUG Leaders

Atlassian Community Events