The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
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!
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...
Connect with like-minded Atlassian users at free events near you!
Find an eventConnect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.
Host an eventYou're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events