Last active
March 24, 2021 04:02
-
-
Save catm705/11255842 to your computer and use it in GitHub Desktop.
GIT with GROUPS
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 GROUP 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. | |
________________________________________________________________________ | |
** Beginning of Day: ** | |
1.) git branch develop | |
2.) git checkout develop | |
3.) git push origin develop | |
4.) git pull origin develop → That’s what the group should do often before working on anything. | |
________________________________________________________________________ | |
*** Feature branch *** | |
________________________________________________________________________ | |
1.) git branch feature_branch_name | |
2.) git checkout feature_branch_name | |
3.) git 'feature_branch_name' is the feature branch's name - make it semantic. | |
* After you’re finished working on your code: | |
* git add . | |
* git commit | |
* git checkout develop | |
* git pull origin develop! | |
- Deal with any conflict issues locally so team doesn’t have to. | |
* git merge feature_branch_name → to merge the feature branch | |
* git push origin develop → To push up your changes. | |
**** Keep doing the last 2 steps until there are no issues for the whole team.**** | |
GIT CZAR does this: | |
* git checkout master | |
* git pull origin master | |
* git merge develop | |
* git push origin master | |
* git push heroku master | |
THEN PEON teammates 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