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 support for ff-only merges #176

Merged
merged 4 commits into from Apr 1, 2020

Conversation

dlwyatt
Copy link
Member

@dlwyatt dlwyatt commented Mar 31, 2020

No description provided.

Copy link
Member

@bluekeyes bluekeyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is neat, I forgot you can "merge" PRs by including their code on the target branch via a ref update. Some minor style comments, but looks good otherwise.

bulldozer/merge.go Outdated Show resolved Hide resolved
bulldozer/merge.go Show resolved Hide resolved
@dlwyatt
Copy link
Member Author

dlwyatt commented Apr 1, 2020

@bluekeyes Any other updates needed for this?

Copy link
Member

@bluekeyes bluekeyes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more error to wrap, but looks good otherwise.

bulldozer/merge.go Outdated Show resolved Hide resolved
@bluekeyes bluekeyes merged commit 7d497e1 into palantir:develop Apr 1, 2020
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

Successfully merging this pull request may close these issues.

None yet

2 participants