Changed bors commit message and added a reference in the PR template #42
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,14 @@ | ||
| ## Description | ||
| | ||
| *Please add a description here. This will become the commit message of the merge request later.* | ||
| | ||
| <!-- Commit message above. Everything below is not added to the message. Do not change this line! --> | ||
| | ||
| ## Review Checklist | ||
| - [ ] Code contains useful comments | ||
| - [ ] (Integration-)Test cases added (or not applicable) | ||
| - [ ] Documentation added (or not applicable) | ||
| - [ ] Changelog updated (or not applicable) | ||
| - [ ] Cargo.toml only contains references to git tags (not specific commits or branches) | ||
| | ||
| Once the review is done, comment `bors r+` (or `bors merge`) to merge. [Further information](https://bors.tech/documentation/getting-started/#reviewing-pull-requests) |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've removed it for now