Docs(merge_strategies): Clarfiy rebase and ff merge similarity#11373

lecoursen merged 6 commits intogithub:maingithub/docs:mainfrom

devtayls:docs/rebase-and-merge-summarydevtayls/docs:docs/rebase-and-merge-summaryCopy head branch name to clipboard