What is a Pull request ?

Description

Pull requests let you tell others about changes you've pushed to a branch in a repository.
Once a pull request is opened, you can discuss and review the potential changes with collaborators and add follow-up commits before your changes are merged into the dev branch.

When do I create a Pull request ?

After you have committed changes and published a new branch you will have to create a pull request to let the team review the changes before they are applied to the dev branch if accepted, team member may also comment and suggest modification(s).

How to create a Pull request ?

When you have published a branch with new commits you will have a button to create a new Pull request
(On the web version and in Github Desktop app)

Filling the form

1. Enter a proper title for your pull request that will appear in the changelog
2. Optionally, select one or multiple reviewer(s) if the feature is related specifically to a team member (Leave empty if you are not sure)
3. Optionally, select one or multiple assignee(s) that will be in charge of the final merge (Leave empty if you are not sure)
4. Select all the labels appropriate for the Pull request
5. Select the project that this Pull request is related to
6. Enter details in the description field for additional information about the changes
7. Click Create Pull request

How to review a Pull request ?

1. Open the Pull request page and check the commit(s) and conversation history
2. Check the code to be added and make sure it follow the Coding Convention
3. Set the branch as active on your local machine
4. Test the new feature in your game
5. Click on Add your review on the top of the Pull request page
   (Only available if you are assigned as a reviewer)

Who and how to merge a reviewed Pull request ?

1. The assignee should be the developer and/or the contributor of the feature
2. The assignee(s) should/must also review the changes
3. When everything is alright the assignee will create a merge into the appropriate branch dev, release-*

What to do in case of conflict ?

Sometime when merging a Pull request a conflict can happen, this mean that a more recent merge modified one or more of the same files.
Clicking on resolve conflict will let you fix any conflict, if you are unsure what to do request help from a team member.