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

Editorial: Add para re resolving conflicts with master. #1099

Merged
merged 1 commit into from Feb 13, 2018

Conversation

Projects
None yet
4 participants
@jmdyck
Collaborator

jmdyck commented Feb 12, 2018

(based on #1044 (comment))

@ljharb

ljharb approved these changes Feb 12, 2018

Seems good to me, let’s see what others think.

@ljharb ljharb requested review from bterlson and bmeck Feb 12, 2018

@bmeck

This comment has been minimized.

Member

bmeck commented Feb 12, 2018

I'm completely neutral to this.

@bterlson

This comment has been minimized.

Member

bterlson commented Feb 13, 2018

👍 for me, merge commits make me sad.

@bterlson

This comment has been minimized.

Member

bterlson commented Feb 13, 2018

Editors seem to agree, so merging this.

@bterlson bterlson merged commit c8a60ac into tc39:master Feb 13, 2018

@jmdyck jmdyck deleted the jmdyck:contributing-tweak branch Feb 13, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment