20,290
edits
Typical Git workflow: Difference between revisions
m
→7) Merge local branch into local master
mNo edit summary |
|||
| Line 84: | Line 84: | ||
To update your local repository to the newest commit, execute<br> | To update your local repository to the newest commit, execute<br> | ||
<pre>git pull | <pre>git pull | ||
</pre> | |||
This will in fetch and merge remote changes in your working directory.<br> | |||
To merge another branch into your active branch (e.g. master), use | |||
<pre>git merge <branch> | |||
</pre> | </pre> | ||
== 8) Push local master to remote git repostiory<br> == | == 8) Push local master to remote git repostiory<br> == | ||