Giter VIP home page Giter VIP logo

github-example's Introduction

A Project with Multiple Parties

Pairs (or Stooges)

Partner creating the project

  1. One person create a project with a corresponding repository
  2. Once the repository is created, add your partner(s) as Collaborators (Settings > Collaborators > [Enter username of partner])
  3. Have your partner fork the repository and complete the following steps

Partner forking the project

  1. Clone the project to your machine
  2. Add the original project as an upstream (git remote add upstream https://github.com/[your-partners-username]/[name-of-the-original-project])

Work flow

  1. Before starting any work on code, create a feature branch (git checkout -b some-descriptive-name). Name it something describing the type of work you will be doing. (i.e. add-course-controller)
  2. Make sure your work will not collide with your partners and begin making your tasked feature/fix/update etc. making meaningful commits as you go
  3. Once you finish your feature, push your branch up to GitHub (git add ., git commit -m "Finish course controller v1", git push)
  4. Navigate to GitHub in your browser and go to the ORIGINAL project. There will be a yellow banner above the project files asking if you want to submit a pull request (PR)
  5. Submit the PR and assign your partner to said PR (NEVER merge your own PR. Always have someone do a review of your code)
  6. Once your partner approves your code they should merge the PR
  7. Once the PR is merged, delete the feature branch both locally and remotely and pull from the master branch

If you are the partner that forked the project

  1. instead of doing git pull from the master branch, you will instead switch to the master branch and execute the following:
    1. git fetch upstream master
    2. git merge upstream/master master

This will give you the updates from the original project.

Now, make a new feature-branch and start the process again.

github-example's People

Contributors

donhamiltoniii avatar

Watchers

James Cloos avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.