search

Blackbaud-BobbyEarl / hacker-backer

A repo to test hackathon concepts.
0 stars 0 forks source link

Contribution Model #2

Open Blackbaud-BobbyEarl opened 8 years ago

Blackbaud-BobbyEarl commented 8 years ago

All committing to master vs fork (likely branch) and pull? Possible workflows are:

All to master

  1. Locally (everyone) makes changes and commits to master (again, locally)
  2. Before git push, you would need to git pull (or git fetch) and hopefully successfully merge, or deal with merge conflicts.
  3. git push origin master

Pull Request

  1. Before beginning, create task specific branch from latest master. For example, "creating-about-page." This can be done in GitHub or locally via git checkout -b creating-about-page
  2. Work locally in creating-about-page branch.
  3. Commit changes and push creating-about-page to origin.
  4. In GitHub, create pull request. If no merge conflicts, merge away. If conflicts exist, follow these instructions.
Pofriel commented 8 years ago

I'm for the pull request model. But I'm biased by familiarity

Blackbaud-BobbyEarl commented 8 years ago

I believe @stevebrush is familiar with that one as well. I vote for using branches + pull requests.

Blackbaud-SteveBrush commented 8 years ago

Yep, this works.