Permalink
Switch branches/tags
Nothing to show
Find file Copy path
Fetching contributors…
Cannot retrieve contributors at this time
57 lines (41 sloc) 2.61 KB

Това са събраните материали от нещата, които Стефан Кънев показа за Github Multiplayer.

Добри практики

Commit Messages

Rebase vs. Merge (Pull with Rebase)

Модели за работа

Gitflow

  • https://github.com/nvie/gitflow
  • Подходящ за приложения със строго определени версии
  • Поддържа множество branch-ове : master, release, develop, feature-branches, hotfix
  • Много "церемония"
  • Изисква допълнителен Tool за работа

Github Flow

Поддържа 6 правила:

  1. Anything in the master branch is deployable
  2. To work on something new, create a descriptively named branch off of master (ie: new-oauth2-scopes)
  3. Commit to that branch locally and regularly push your work to the same named branch on the server
  4. When you need feedback or help, or you think the branch is ready for merging, open a pull request
  5. After someone else has reviewed and signed off on the feature, you can merge it into master
  6. Once it is merged and pushed to ‘master’, you can and should deploy immediately

Skanev Flow

  • Смесица между горните два flow-a
  1. Master is always deployable / stable
  2. Production branch points to the current deployed version
  3. Feature branches off master
  4. Single commits to master are OK
  5. Open pull request when ready with the feature
  6. To close a pull request, everyone in the team should :shipit: