git
Differences
This shows you the differences between two versions of the page.
| Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
| git [2023/11/03 10:26] – [Merge changes form master branch in current branch] odefta | git [2025/01/02 20:22] (current) – external edit 127.0.0.1 | ||
|---|---|---|---|
| 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.1698999991.txt.gz · Last modified: 2023/11/03 10:26 by odefta