Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
systems:git_setup_and_configuration [2018/06/15 13:10] smayr [Git Flow] |
systems:git_setup_and_configuration [2018/06/18 14:39] (current) smayr [Synchronize Changes] |
||
---|---|---|---|
Line 208: | Line 208: | ||
$ git pull # Downloads bookmark history and incorporates changes | $ git pull # Downloads bookmark history and incorporates changes | ||
| | ||
+ | **Fetch vs. Pull:** Do a '' | ||
+ | |||
+ | Basically a '' | ||
+ | |||
+ | Therefore, instead of a '' | ||
+ | |||
+ | See: | ||
+ | * [[https:// | ||
+ | * [[https:// | ||
+ | |||
+ | Get any changes in the remote branch since the last pull: | ||
+ | $ git fetch | ||
+ | $ git diff ...origin (or $ git diff origin/ | ||
=== Merge or Rebase === | === Merge or Rebase === | ||
Merge the '' | Merge the '' | ||
Line 289: | Line 302: | ||
Organizing your repository to use git flow. | Organizing your repository to use git flow. | ||
{{ : | {{ : | ||
+ | Author: Vincent Driessen | | ||
+ | Original blog post: http:// | ||
+ | License: Creative Commons BY-SA | ||
* Use Semantic Versioning: [[https:// | * Use Semantic Versioning: [[https:// |