Skip to content
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

Merged
merged 3 commits into from
May 21, 2024
Merged

Conversation

willfish
Copy link
Member

@willfish willfish commented May 20, 2024

Jira link

BAU

What?

I have added/removed/altered:

  • Added a note on squashing/rebasing

Why?

I am doing this because:

  • This has caused some issues in visibility of change in releases due to a misunderstanding

Copy link

@jebw jebw left a 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)


## 11. A note on merging pull requests

We rely on merge commits (e.g. no squashing/rebasing) to highlight when a pull request
Copy link

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)

Copy link
Member Author

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.

jebw
jebw previously approved these changes May 21, 2024
Copy link

@jebw jebw left a 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) ?

@willfish willfish merged commit 3010d47 into main May 21, 2024
2 checks passed
@willfish willfish deleted the BAU-squash-comits branch May 21, 2024 10:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants