Differences

This shows you the differences between two versions of the page.

--- git [2023/10/25 06:02] – [Sync fork with original repo] odefta
+++ git [2025/01/02 20:22] (current) – external edit 127.0.0.1
@@ Line 32: / Line 32: @@
 git checkout master
 git fetch upstream
-git rebase upstream/master
+git merge upstream/master
 git stash pop
 </code>
+====== Merge changes form master branch in current branch ======
+<code>
+git.exe merge remotes/origin/master
+</code>