20,290
edits
Typical Git workflow: Difference between revisions
m
no edit summary
mNo edit summary |
|||
| Line 87: | Line 87: | ||
This will in fetch and merge remote changes in your working directory.<br> | 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 | To merge another branch into your active branch (e.g. master), use | ||
<pre>git merge <branch> | <pre>git merge <branch> </pre> | ||
in both cases git tries to auto-merge changes. Unfortunately, this is not always possible and results in conflicts. You are responsible to merge those conflicts manually by editing the files shown by git. After changing, you need to mark them as merged with<br> | |||
<pre>git add <filename> </pre> | |||
before merging changes, you can also preview them by using | |||
<pre>git diff <source_branch> <target_branch> | |||
</pre> | </pre> | ||
== 8) Push local master to remote git repostiory<br> == | == 8) Push local master to remote git repostiory<br> == | ||