Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- cd to the project
- open a regular webpage to github (my github)
- open a private webpage to github (server's github)
- git status (to view the status)
- git branch -v (to view all branches and check which branch your on)
- Setting things up:
- git clone <clone url>
- cd into the project
- git status to view
- git branch -v (check if only the master is there)
- repeat for each branch:
- ex. git checkout -b brian origin/brian
- Now making first commit:
- git checkout brian (to switch to my branch)
- nano README.md
- git add .
- git commit -m '<message>'
- **might have to set up identification**
- git config --global user.email "<email>"
- git config --global user.name "<your name>"
- git push origin brian
- **then asks for credentials**
- switch to brian branch on github (my github)
- new pull request
- switch to private window of the triftek server github (username: triftek, password: khanal2845)
- click on pull request and merge
- create a pull request
- **there might be merge conflict**
- if there is a merge conflict, might have to delete things
- merge (this updated the server's master)
- **one time thing**
- git remote add upstream <url of triftek repo (the clone)>
- git remote -v (this checks the origin and upstream)
- git checkout master
- git fetch upstream
- git rebase upstream/master
- if want to update a specific branch
- git checkout brian
- git fetch upstream
- git rebase upstream/brian
- then
- git merge brian master or might be git merge master brian
- Updating your github: (updating the master of the github/ pushing from local to remote repo)
- git push --all
- **asks for credentials**
- How to run the master:
- git checkout to master (if not there already or do git branch -v to check what branch i'm in then switch to master)
- cd to the project
- python manage.py runserver
Add Comment
Please, Sign In to add comment