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

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.

Get started Tell me more
Atlassian Community about banner
4,298,023
Community Members
 
Community Events
165
Community Groups

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
277 views

0 comments

Comment

Log in or Sign up to comment
Bitbucket
Bitbucket
TAGS
Community showcase
Colin Wood
Colin Wood
Published in Bitbucket

Git push size limits are coming to Bitbucket Cloud starting April 4th, 2022

Beginning on April 4th, we will be implementing push limits. This means that your push cannot be completed if it is over 3.5 GB. If you do attempt to complete a push that is over 3.5 GB, it will fail...

2,222 views 2 9
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