Skip to content
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

Merged
merged 5 commits into from
Dec 21, 2012
Merged

Properly formatted README and made it more descriptive #4

merged 5 commits into from
Dec 21, 2012

Conversation

komiga
Copy link
Contributor

@komiga komiga commented Dec 20, 2012

See commit diff.

@komiga
Copy link
Contributor Author

komiga commented Dec 20, 2012

@RichiH Fair enough.

@TimNN Woops.

@ghost ghost assigned frankc-valve Dec 20, 2012
@frankc-valve
Copy link
Contributor

I'll look into this. GitHub claims it can't auto-merge your changes into the master.

@komiga
Copy link
Contributor Author

komiga commented Dec 20, 2012

@frankc-valve Right, that's because my branch started from an earlier commit. Three choices here:

  1. Get someone who knows how to use git to merge my branch.
  2. I can muddy up the tree by rebasing to your current master and recommitting (which you can then merge automatically in GitHub).
  3. Someone can give me commit access and I'll do choice 1 myself.

@RichiH
Copy link
Contributor

RichiH commented Dec 21, 2012

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:

  • Rewrite public history. Horrible.
  • Merge your patchset by hand. You could simply send a pull request for the result of that.
  • Rebase your patchset on top of master and request that to be merged.

As rebasing takes less time than both of us typing this, I know what I think is the best course of action... ;)

Tim Howard added 2 commits December 21, 2012 13:03
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
@komiga
Copy link
Contributor Author

komiga commented Dec 21, 2012

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.

frankc-valve added a commit that referenced this pull request Dec 21, 2012
Properly formatted README and made it more descriptive
@frankc-valve frankc-valve merged commit a047d99 into ValveSoftware:master Dec 21, 2012
@ghost ghost mentioned this pull request Feb 15, 2013
@piegtas piegtas mentioned this pull request Mar 28, 2013
@MayeulC MayeulC mentioned this pull request May 11, 2013
@ghost ghost mentioned this pull request Feb 27, 2017
@SleepingSloth SleepingSloth mentioned this pull request Nov 14, 2018
@amitavmohanty01 amitavmohanty01 mentioned this pull request Mar 9, 2019
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.

None yet

3 participants