Skip to content

Conversation

@mxmeinhold
Copy link

No description provided.

@shaeespring
Copy link
Contributor

Is there a reason this can't be merged into dev separately? At first glance, I don't see anything that depends on #52, and it would prevent these pesky conflicts as you continue to work on #52

@mxmeinhold
Copy link
Author

I'll fix the conflicts before this goes for merge, but does this need to get into dev imminently?

@mxmeinhold
Copy link
Author

Also: it's rebase one or the other, given this runs gofmt

@mxmeinhold
Copy link
Author

Oh, actually, it's gonna be a mess regardless, because someone disabled merge commits

@shaeespring
Copy link
Contributor

Oh, actually, it's gonna be a mess regardless, because someone disabled merge commits

Yeah, I'm not sure why this is

I'll fix the conflicts before this goes for merge, but does this need to get into dev imminently?

No, just curious as to why it should go into #52 since it feels separate from hiding things

@mxmeinhold
Copy link
Author

It is based on the CI setup in that PR. It does not need to be merged into that PR, but it includes the commits from that PR, so it should not go into mainline without commits from that PR

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