Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revision | Next revisionBoth sides next revision | ||
| howto:git [2022/02/12 01:29] – [Branches] I guess I'm using putting $ prompts before git commands on this page digital man | howto:git [2022/10/19 20:31] – [Merge Upstream Changes into Your Branch] Need merge from remote tracking 'master' branch digital man | ||
|---|---|---|---|
| Line 64: | Line 64: | ||
| $ git pull | $ git pull | ||
| - | $ git merge master | + | $ git merge origin/master |
| ===== Push Without Merge Commit ===== | ===== Push Without Merge Commit ===== | ||
