- Clone
- Add branch
- Change in branch
- Commit and push to branch
- Create Pull Request in Github
- Checkout master branch
- Pull master
- Checkout conflicting branch
- Rebase with master
git rebase master
- Push conflicting branch
- On conflictign branch:
- In IntelliJ - Pull (Branches to merge: origin/master)
- Resolve conflicts
- Push conflicting branch