Changed bors commit message and added a reference in the PR template #42
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
nightkr reviewed Dec 21, 2021
| pr_status = [ 'license/cla' ] | ||
| timeout_sec = 7200 | ||
| timeout_sec = 7200 | ||
| cut_body_after = "<!-- Commit message above. Everything below is not added to the message. Do not change this line! -->" |
template/bors.toml Outdated
| 'Run cargo deny (bans licenses sources)' | ||
| ] | ||
| delete_merged_branches = true | ||
| use_squash_merge = true |
Contributor
There was a problem hiding this comment.
We had issues where squash merges didn't close the PR properly.
I'm also curious about what use-case you're trying to solve with squashing? Git itself can show the history as if every merge was a squash with git log --first-parent.
Contributor Author
There was a problem hiding this comment.
That was mostly to emulate how we did it before I thought maybe it was on accident that you missed that. I also kind of liked that all my "WIP" commits don't show up in the final thing but I'm happy either way
Contributor Author
There was a problem hiding this comment.
I've removed it for now
…or-templating into bors-commit-message
Merged
Member
| Included here #46 |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
The description of the PR becomes the commit message of the merge commit after it is merged (see here for an example).
This PR uses the
cut_body_afterproperty to cut off our review checklist. It also adds a short note to use bors for the merge.It also configures bors to do a squash merge.(Doesn't work)