GITHUB FLOW
- From Master: Git Pull (this will bring in the latest code down)
- git checkout -b name the branch
——————— once finished with feature ————————— 3. commit everything (git add/commit) 4. git checkout master 5. git pull —> this checks whether master has been changed since create branch. 6. git checkout 7. git merge master 8. git push origin -u 9. open pull request (tell mentor I've open pull request)
git branch -d
——— fix merge conflict ———— <<<<HEAD
this is will be my code
master
this is there other coders
To Start Working On the Project
-
Fork/Clone to your local drive/machine.. $git clone https://github.com/CloneWellsFargoChase/groupProject.git
-
Create a new branch.. $git checkout -b
-
Run 'npm install' to install all package dependencies.. $npm install
-
Run 'npm start' to view in browser.. $npm start
-
REBASE often!!!.. $git pull
To Commit Changes Locally
-
Run git status to check for local changes.. $git status
-
Add files to commit.. $git add .
-
Commit changes to local directory with the following structure.. $git commit -m 'finished: insert-text-here'
To Commit Changes To Github
-
Run git remote -v to determine upstream name. Validate for exact match to the name and path below.. $git remote -v
origin https://github.com/CloneWellsFargoChase/groupProject.git (fetch)
origin https://github.com/CloneWellsFargoChase/groupProject.git (push)
-
Run git push origin .. $git push origin test-branch
-
Merge request to be approved by approver(Dallin).
-
Delete your local branch and REBASE once merge has been approved.
Rebasing
-
Checkout to local master branch.. $git checkout master
-
Rebase with remote master.. $git pull
-
Switch to local branch.. $git checkout branch-name
-
Merge local branch with master.. $git merge master
Bugs/Defects/Errors -- Please raise any issues/concerns/bugs in the issues tab --
React
Typescript
Django
Laravel
Facebook
Microsoft
Google
Alibaba
D3
Tencent