-
-
Save crywolfe/11256484 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
________________________________________________________________________ | |
GIT HUB WITH PROJECTS | |
________________________________________________________________________ | |
* git branch -d → Will delete the branch completely if it SUCKS. | |
* AlWAYS pull first before you start your work. | |
* git checkout develop → Never work on master branch. | |
- Your MASTER branch must always work. | |
________________________________________________________________________ | |
$ git branch develop | |
$ git checkout develop | |
$ git push origin develop | |
git pull origin develop → That’s what the group should do often before working on anything. | |
________________________________________________________________________ | |
*** Feature branch *** | |
________________________________________________________________________ | |
- git branch login, git checkout login → ‘login is the feature branch's name - could be anything’ | |
* after you’re finished working on your code: | |
* git add . | |
* git commit | |
* git pull origin develop | |
- Deal with any conflict issues locally so team doesn’t have to. | |
- git checkout develop, | |
- git merge login → to merge the feature branch | |
- git push origin develop → To push up your changes. | |
- git pull origin develop → Teammates do this then... | |
**** Keep doing the last 2 steps until it works for the whole team.**** | |
GIT CZAR does this: | |
* git checkout master | |
* git merge develop | |
* git push origin master | |
* git push heroku master | |
THEN PEONS DO THIS: | |
* git checkout master | |
* git pull origin master |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment