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

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

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

0 comments

Comment

Log in or Sign up to comment
Bitbucket
Bitbucket
TAGS
Community showcase
Ash Moosa
Ash Moosa
Posted in Bitbucket

How do you use the Bitbucket-Jira integration? How does it help your team?

Hey everyone, over the past year, we've added several new features on how you can use Bitbucket and Jira together. We'd love to know how you'll are using the integration and how it's helping your t...

97 views 0 2
Join discussion

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