From b8a2df95ba9b4f74c6a8ac8bf3eb7d9ac3ab3f66 Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Tue, 19 Sep 2023 09:25:49 -0400 Subject: [PATCH 1/6] List correct branch to base changes on in CONTRIBUTING.md The default branch is `trunk`, not `main`. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2af1642e..30a0bdfe 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ the project. ## Base your work off the correct branch -All new work should be based on `main`. +All new work should be based on `trunk`. ## Propose a minimal set of related changes From 596834fdc808822b1dca1d12898ec83b9a38cb1b Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Tue, 19 Sep 2023 09:29:25 -0400 Subject: [PATCH 2/6] Update PULL_REQUEST_TEMPLATE.md There is no CONTRIBUTORS.md file --- .github/PULL_REQUEST_TEMPLATE.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 503b1aac..f0268873 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,4 +17,3 @@ Resolves #??? - [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-validation/blob/trunk/CONTRIBUTING.md). - [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-validation/blob/trunk/ContributorAgreement.md). -- [ ] My name is on the list of contributors (`CONTRIBUTORS.md`) in the pull request source branch. From 4fd71403de805bef0964fa333ee8d4e0e35b2876 Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Fri, 22 Sep 2023 21:48:09 -0400 Subject: [PATCH 3/6] Add contributors line back to PR template --- .github/PULL_REQUEST_TEMPLATE.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f0268873..503b1aac 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,3 +17,4 @@ Resolves #??? - [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-validation/blob/trunk/CONTRIBUTING.md). - [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-validation/blob/trunk/ContributorAgreement.md). +- [ ] My name is on the list of contributors (`CONTRIBUTORS.md`) in the pull request source branch. From 6531fadb00ad65574423ec001a22bd425f1010bc Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Fri, 22 Sep 2023 21:48:46 -0400 Subject: [PATCH 4/6] Add mailmap --- .mailmap | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..36fb78bf --- /dev/null +++ b/.mailmap @@ -0,0 +1,3 @@ +Tim Moore Tim Moore +Tommy Waltmann Tommy Waltmann <53307607+tommy-waltmann@users.noreply.github.com> +Tommy Waltmann tommy-waltmann <53307607+tommy-waltmann@users.noreply.github.com> From 9c4933c1d8bed8a9945730b5e155fa5b23a97648 Mon Sep 17 00:00:00 2001 From: Tim Moore Date: Fri, 22 Sep 2023 22:05:45 -0400 Subject: [PATCH 5/6] Add CONTRIBUTORS.md --- CONTRIBUTORS.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CONTRIBUTORS.md diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md new file mode 100644 index 00000000..0c0a8e12 --- /dev/null +++ b/CONTRIBUTORS.md @@ -0,0 +1,8 @@ +# Contributors + +The following people have contributed to HOOMD-validation: + +* Joshua A. Anderson, University of Michigan +* Tommy Waltmann, University of Michigan +* Tim Moore, University of Michigan +* Brandon Butler, University of Michigan From e847901275c7282f1313a62562af5d5820641f53 Mon Sep 17 00:00:00 2001 From: "Joshua A. Anderson" Date: Mon, 25 Sep 2023 09:20:41 -0400 Subject: [PATCH 6/6] Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 0c0a8e12..0500dcaf 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,6 +1,6 @@ # Contributors -The following people have contributed to HOOMD-validation: +The following people have contributed to hoomd-validation: * Joshua A. Anderson, University of Michigan * Tommy Waltmann, University of Michigan