This is documentation of Sarah and Nancy's pilot GitHub project
$ cd your_directory_here
$ ls
$ git add .
$ git status
$ gitcommit -m "I made an edit. Yay."
$ git push
$ git pull origin master
- Do a pull
- Manage conflicts
- Remove markers of the conflicts (>>>> and ======)
- Push again
$ git checkout -b branch-name
$ git add .
$ git commit -m "your message"
$ git push origin branch-name
$ git checkout master
$ git pull the-branch-you-want-t-pull-from
$ git add .
$ git commit -m "your message"
$ git push origin master
$ git branch
The starred repo is the current one.
press "i" write your merge message press "esc" write ":wq" then press ent
https://www.sap.com/developer/tutorials/webide-github-merge-pull-request.html
$ git checkout your-branch
$ git add .
$ git commit -m “message”
$ git push
$ git checkout master
$ git pull origin master
$ git merge your-branch -m “comment”
$ git push
- First, fork from the GitHub page of the repo you’d like
- Navigate to directory on your machine
$ git clone url-of-forked-repo
https://help.github.com/articles/merging-an-upstream-repository-into-your-fork/ …starting in YOUR FORK’s repo on your machine
$ git checkout master
$ git pull https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY.git BRANCH_NAME
$ git push