test_pull_request

1. Clone
2. Add branch
3. Change in branch
4. Commit and push to branch
5. Create Pull Request in Github

How to resolve Pull Request conflict

1. Checkout master branch
2. Pull master
3. Checkout conflicting branch
4. Rebase with master git rebase master
5. Resolve conflicts
6. Push conflicting branch

Alternative

On conflictign branch:

1. In IntelliJ - Pull

• Branches to merge: origin/master

2. Resolve conflicts
3. Push conflicting branch