Skip to content

Instantly share code, notes, and snippets.

@theevo

theevo/Pull Request on Github always.md

Created April 29, 2020 05:42
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save theevo/aaa3378c2faeb483b0e3af4fc1c8f078 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save theevo/aaa3378c2faeb483b0e3af4fc1c8f078 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
Pull Request on Github always.md

Pull Request on Github, always

You want code? Pull Request

If Theo wants some code in Dave's branch, Theo should log into GitHub and pull request from Dave's branch to Theo's branch.

It will be Theo's responsibility to resolve any merge conflicts that arise from the pull.

Once the pull request is complete and any arising merge conflicts resolved, Theo will run the following command to get the code onto his local machine:

git pull origin theo

Got a stable new feature to share? Pull Request

Stable = the project builds in Xcode and runs in Simulator without crashing

  1. Commit your code. git add . then git commit -m "add cool new feature"
  2. Push to your branch on GitHub. git push origin <yourname>
  3. Sign in to GitHub and create a pull request from to develop1.
  4. Name your fellow team members as reviewers2.

Why not "git pull" in Terminal?

Because you may create a conflict. Conflicts are just nicer and easier to deal with in GitHub.

Footnotes

  1. The use of both a Master and Develop Branch comes from Gitflow. ↩

  2. Every PR that comes in has to be reviewed by another contributor. --Danny de Vries ↩

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment