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

Add documentation about not making changes directly to master branch or performing squash merges or rebase merges #144

Open
notmessenger opened this issue Mar 6, 2018 · 1 comment

Comments

@notmessenger
Copy link
Contributor

Per the conversation in #142 making changes directly to the master branch of a repo without the use of a PR or the merging of a PR as either a squash merge or a rebase merge will cause a new version to released with the previous PR's scope and CHANGELOG.md contents to be used. This is not desirable, but per #142 (comment) it has not yet been determined how this can be prevented programmatically so in the meantime it should be noted in the README.md that this behavior should be avoided.

@job13er
Copy link
Contributor

job13er commented Aug 3, 2018

FYI: I figured out a way to support squash and rebase merging in GitHub. Not sure if the process will work for bitbucket or any other vcs, but the GitHub API gives a merge_commit_sha in the pull request description that you can match against the commit you're building. Here's how implemented it in bumpr (my pr-bumper implementation): https://github.com/jobsquad/bumpr/blob/v2.1.0/src/vcs/github.js#L72-L96

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants