-
Notifications
You must be signed in to change notification settings - Fork 174
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
Properly formatted README and made it more descriptive #4
Conversation
I'll look into this. GitHub claims it can't auto-merge your changes into the master. |
@frankc-valve Right, that's because my branch started from an earlier commit. Three choices here:
|
I can't see how rebasing on master muddies up anything. Arguably, if they are planning to merge your changes, they shouldn't have merged mine. Anyway, it's down to one of the following:
As rebasing takes less time than both of us typing this, I know what I think is the best course of action... ;) |
Merge remote-tracking branch 'upstream/master' Conflicts: README.md
Sorry for the delay. I was hoping for a quick turnaround from @frankc-valve before I transitioned to my other million tasks. @frankc-valve GitHub should now be able to automatically merge this PR. I have made additional changes in the last commit; please review them. |
Properly formatted README and made it more descriptive
See commit diff.