-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
BAU: Document merge commits for releases #31
Conversation
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 think the rebasing comment is a bit misleading (ideally developers would rebase their branches to clean them up)
source/manual/get-started.html.md
Outdated
|
||
## 11. A note on merging pull requests | ||
|
||
We rely on merge commits (e.g. no squashing/rebasing) to highlight when a pull request |
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.
squash merges or rebase merges
rebasing a branch is something we allow (and encourage)
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.
Yeah makes sense. I'll have a think about rewording.
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.
might be better to refer to GitHubs terms (ie no squash + merge instead of no squashing) ?
Jira link
BAU
What?
I have added/removed/altered:
Why?
I am doing this because: