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!
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 are using the integration and how it's helping your team...
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