Skip to content

Fixing #1809#1810

Closed
frezbo wants to merge 1 commit into
opencontainers:masterfrom
frezbo:master
Closed

Fixing #1809#1810
frezbo wants to merge 1 commit into
opencontainers:masterfrom
frezbo:master

Conversation

@frezbo
Copy link
Copy Markdown

@frezbo frezbo commented May 30, 2018

Signed-off-by: Noel Georgi 18496730+frezbo@users.noreply.github.com

@AkihiroSuda @cyphar I think its time to add some simple PR checks, I can think of travis or something.

Signed-off-by: Noel Georgi <18496730+frezbo@users.noreply.github.com>
@frezbo
Copy link
Copy Markdown
Author

frezbo commented May 30, 2018

Hmm seems we have a travis, wonder how we got this merged in?

@AkihiroSuda
Copy link
Copy Markdown
Member

Thanks but dupe of #1808

I think its time to add some simple PR checks, I can think of travis or something.

As mentioned in #1808 this was caused by merge conflict.
So unlikely to be checkable on CI.

@frezbo
Copy link
Copy Markdown
Author

frezbo commented May 30, 2018

ahh yes, thanks. Closing in favor of #1808

@frezbo frezbo closed this May 30, 2018
@cyphar
Copy link
Copy Markdown
Member

cyphar commented May 30, 2018

A simple way of fixing it would be to only allow PRs that have been rebased to be merged. I do this in umoci but I think it starts pissing people off when you ask them to rebase a PR 50 times. 😉

@frezbo
Copy link
Copy Markdown
Author

frezbo commented May 30, 2018

lol, I get that, but that's the standard I follow in our organisation. Always rebase before pushing. Maybe we should add that in contributing.md? What do you think

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.

3 participants