git
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revision | |||
git [2023/11/03 10:26] – [Merge changes form master branch in current branch] odefta | git [2023/11/28 23:35] (current) – [Sync fork with original repo] odefta | ||
---|---|---|---|
Line 32: | Line 32: | ||
git checkout master | git checkout master | ||
git fetch upstream | git fetch upstream | ||
- | git rebase | + | git merge upstream/ |
git stash pop | git stash pop | ||
</ | </ |
git.txt · Last modified: 2023/11/28 23:35 by odefta