Med Java

User Tools

Site Tools

Trace:
git

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
git [2023/11/03 10:26] – odeftagit [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 upstream/master+git merge upstream/master
 git stash pop git stash pop
 </code> </code>
Line 38: Line 38:
 ====== Merge changes form master branch in current branch ====== ====== Merge changes form master branch in current branch ======
  
 +<code>
 git.exe merge remotes/origin/master git.exe merge remotes/origin/master
 +</code>
  
  
git.txt · Last modified: 2023/11/28 23:35 by odefta