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/10/25 06:02] – odeftagit [2025/01/02 20:22] (current) – external edit 127.0.0.1
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
 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>
 +
 +====== Merge changes form master branch in current branch ======
 +
 +<code>
 +git.exe merge remotes/origin/master
 +</code>
 +
  
  
git.1698202930.txt.gz · Last modified: 2023/10/25 06:02 by odefta