Skip to content

Conversation

@gierschv
Copy link
Contributor

@gierschv gierschv commented Apr 9, 2017

No description provided.

@webron webron requested a review from Minasokoni April 10, 2017 01:47
@Minasokoni
Copy link
Contributor

@gierschv Just need to get rid of that merge conflict and this is gtg

@tomsaleeba
Copy link

What's the github ettiquette here to get this merged?

  1. poke @gierschv to get them to fix their PR
  2. fork the gierschv fork and fix it, then PR to gierschv so they can update this PR
  3. replicate the changes in my own fork and PR it. (I don't want to steal credit, just want the changes in to get into the main repo)

Cheers

@webron
Copy link
Contributor

webron commented May 31, 2017

Oh wow, this flew under my radar, sorry. @gierschv, if you can resolve the conflicts again, I'll merge. Just make note to add a comment that they are resolved, otherwise I may not have a good indication of it.

Sorry for the delay, and thanks for the effort.

@gierschv
Copy link
Contributor Author

@webron Done, and I removed the bundle from the commit, this will avoid getting new conflicts for this PR.

@webron webron merged commit b242917 into swagger-api:master May 31, 2017
@webron
Copy link
Contributor

webron commented May 31, 2017

Thanks again!

@gierschv gierschv deleted the fix.info-font branch June 1, 2017 08:51
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.

4 participants