Skip to content

Conversation

TopView
Copy link
Contributor

@TopView TopView commented Dec 23, 2017

Guessing this should be from/to, as that's what a "trivial merge" would probably do:
so all of the files you haven't changed in will be updated. <=was
so all of the files you haven't changed will be updated. <=suggesting as simpler than the other option:
so all of the files you haven't changed in it will be updated. <= possible alternative

Guessing this should be from/to, as that's what a "trivial merge" would probably do:
so all of the files you _haven't_ changed in will be updated.   <=was
so all of the files you _haven't_ changed will be updated.       <=suggesting (as simpler for the other option below)

rather than from/to (which :
so all of the files you _haven't_ changed in will be updated.     <==was
so all of the files you _haven't_ changed in it will be updated.  <== possible alternative
@ben
Copy link
Member

ben commented Dec 23, 2017

Nice catch, thanks!

@ben ben merged commit c7d1436 into progit:master Dec 23, 2017
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.

2 participants