From c4ecd49545f3eac7057500a35eeb6c740535b5db Mon Sep 17 00:00:00 2001 From: Stephen Gutekanst Date: Sun, 7 Nov 2021 20:55:20 -0700 Subject: [PATCH] glfw: inform in PR template to send all PRs to main repository Signed-off-by: Stephen Gutekanst --- glfw/.github/pull_request_template.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/glfw/.github/pull_request_template.md b/glfw/.github/pull_request_template.md index 91b1ef3e..f1445970 100644 --- a/glfw/.github/pull_request_template.md +++ b/glfw/.github/pull_request_template.md @@ -1,3 +1,5 @@ +Please send your change to [the main repository](https://github.com/hexops/mach/tree/main/glfw) instead, sorry for the trouble! +This helps us avoid some complex merge conflicts we run into when changes are made to both repositories and history needs to be reconciled. Keeping PRs in just that repository enables us to use `git subtree` to trivially keep the two repositories in sync. -- [ ] By selecting this checkbox, I agree to license my contributions to this project under the license(s) described in the LICENSE file, and I have the right to do so or have received permission to do so by an employer or client I am producing work for whom has this right. \ No newline at end of file +Once your PR is merged over there, it'll automatically sync to this repository.