ParentFull threadZariel·You really should always rebase before merge, the workflow I use is just pull and not worry about rebasing until you want your branch mering.View on HN