Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Interests
See all
Community resources
Top groups
Explore all groups
Community resources

Next challenges

Recent achievements

  • Global
  • Personal

Recognition

  • Give kudos
  • Received
  • Given

Leaderboard

  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Sign up for free Log in
Atlassian Community Hero Image Collage
Highlighted

How continue create pull request after rebase Edited

nngoctan
nngoctan Oct 23, 2018

My step

1. create a branch hotfix_113, changed code and push

2. create a pull request to master branch

3. merge pull request

4. continue update code of branch hotfix_113

5. rebase fixup all commit to only one and force push

6. continue create pull request to master

7. CONFLICTS happen

 

Please guide me how can continue!

 

 

Comment
Watch
Like Be the first to like this

0 comments

Comment

Log in or Sign up to comment
Bitbucket
Bitbucket
TAGS
Community showcase
Imran Khan
Imran Khan
Published in Bitbucket

Powering DevOps with Bitbucket Server & Data Center

Hi everyone, The Cloud team recently announced 12 new DevOps features that help developers ship better code, faster   ! While we’re all excited about the new improvements to Bitbucket ...

2,139 views 0 7
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you