The ["Submit a pull request." section of our dev workflow doc](https://github.com/secure-systems-lab/lab-guidelines/blame/53f1c1283a0d3748e0abc0f77f2505b924e68b73/dev-workflow.md#L47-L50) points to [GitHub docs that explain how to keep your fork in sync](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/syncing-a-fork). It looks like GitHub updated their instruction to use `merge` instead of `rebase`, which conflicts with our recommendation in our [git history guidelines](https://github.com/secure-systems-lab/lab-guidelines/blame/53f1c1283a0d3748e0abc0f77f2505b924e68b73/git-history.md#L19-L22), which strongly favor **`rebase`**. Possible Solutions: 1. Remove link to GitHub doc 1. Replace it with a link to instructions that favor rebase 1. Add a note to follow the instructions only until before the merge and to then use rebase instead of merge