This altassian article: https://www.atlassian.com/git/tutorials/merging-vs-rebasing https://www.atlassian.com/git/tutorials/merging-vs-rebasing In particular

This altassian article: https://www.atlassian.com/git/tutorials/merging-vs-rebasing https://www.atlassian.com/git/tutorials/merging-vs-rebasing In particular the golden rule of never rebasing a public branch has served me very well and I never seem to run into the "merge hell" that others complain of.