This looks more complicated than the merge workflow. It is. It is not hard. It is valuable.
We have our pull
command set up to pull --rebase
, this is a great overview of why you (almost) always want to rebase. (thanks Sandy)
This post is part of the thread: Version Control – an ongoing story on this site. View the thread timeline for more context on this post.