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
Last revisionBoth sides next revision
git [2023/10/25 06:02] – odeftagit [2023/11/03 10:26] – [Merge changes form master branch in current branch] odefta
Line 27: Line 27:
  
 ====== Sync fork with original repo ====== ====== Sync fork with original repo ======
 +<code>
 git remote add upstream https://gitlab../project.git git remote add upstream https://gitlab../project.git
 git stash git stash
Line 34: Line 34:
 git rebase upstream/master git rebase upstream/master
 git stash pop git stash pop
 +</code>
 +
 +====== Merge changes form master branch in current branch ======
 +
 +<code>
 +git.exe merge remotes/origin/master
 +</code>
 +
  
  
git.txt · Last modified: 2023/11/28 23:35 by odefta