Differences
This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
weatherbox:team_nova:git_and_github [2016/01/27 00:04] tyamauchi [Notes] |
weatherbox:team_nova:git_and_github [2021/09/19 21:59] (current) |
||
|---|---|---|---|
| Line 34: | Line 34: | ||
| - Can make edits straight on page or on wiliki | - Can make edits straight on page or on wiliki | ||
| - | - to merge edits, pull onto branch, make edits on branch, then create pull request and select merge | + | - To edit master, pull onto individual branch, make edits on branch, then create pull request and select merge |
| + | |||
| + | - Or, pull link onto wiliki, vi and edit the code, git commit -m "comment", git push "link" [branch to push to] | ||