What is a Pull Request?

A pull request is any change that you want to take from one branch and apply it to another. This can sometimes result in conflicts, which can be resolved on the GitHub webpage, where you can select which portions of the code you would like to keep.

Quick example:

Say you branch off and work on implementing some feature A, and your partner creates another branch to make some feature B

You can merge these two branches together to make the two features on a single branch

• If the two features are completely independent and don't get mixed together code-wise

  • Then a merge can be done without resolving any conflicts

• But, if there are some conflicts between the changes you and your partner have made

  • Then you would need to resolve any conflicts that arose.