git collab
[Assuming you you have cloned the repo to your desktop, not a fork]
Get into a branch to work on your stuff
-Git checkout -b < new branch> -or- git checkout <ur branch>
1. git add . -or- git add <file/folder name>
2. git commit –m “...” (these now saved on ur branch)
3. git checkout master (change over to the master branch)
4. git pull origin master (branch up to date w master)
5. git checkout (get to the branch u were working on)
6. git merge master
( if anything different, not your new code but, other stuff
… you will have a merge conflict)
--- > Go into your code and compare your code vs. master
delete as needed ... both are color coded to compare
... save one, delete the other ... your call
7. git add . (Add the final changes)
8. git commit –m “…”
9. git push origin master
10. Go into the GitHub.com repo and make a pull request
Are there any code examples left?
New code examples in category Shell/Bash
-
Shell/Bash 2022-03-27 22:30:33 wise highlight ubuntu
-
Shell/Bash 2022-03-27 22:25:19 how to send a pull request in git
-
Shell/Bash 2022-03-27 21:55:06 how to open terminal in sublime text ubuntu
-
Shell/Bash 2022-03-27 21:25:19 how to switch branch
-
Shell/Bash 2022-03-27 21:20:25 python
-
Shell/Bash 2022-03-27 21:20:04 set user as admin gitlab
-
Shell/Bash 2022-03-27 21:10:09 apache2 mod_jk proxy to tomcat connector
-
Shell/Bash 2022-03-27 20:35:12 chown
-
Shell/Bash 2022-03-27 20:15:08 awk last match