docs(maintaining): add merge strategies section#3379

jsjoeio merged 1 commit intojsjoeio/milestones-issuescoder/code-server:jsjoeio/milestones-issuesfrom

jsjoeio/docs-merge-strategycoder/code-server:jsjoeio/docs-merge-strategyCopy head branch name to clipboard