search

quadra-game / quadra

An addictive action puzzle game with single player and multiplayer capabilities (Internet or LAN).
GNU Lesser General Public License v2.1
27 stars 18 forks source link

Update README with new required steps on Unix-Like #130

Closed pedrinho closed 10 years ago

pedrinho commented 10 years ago

I was not being able to build on linux following the README so I think that this should help other people

pphaneuf commented 10 years ago

BTW, it's not a big deal for me, but you might find it easier if you create a branch (in your repository) to do changes, as you might find it a bit confusing once we make changes to our master...

pphaneuf commented 10 years ago

Oh, but don't do it for this pull request, otherwise it'll get all confused. :stuck_out_tongue:

pphaneuf commented 10 years ago

Could you flatten all this into a single commit? You can do this with these commands:

git reset --soft 99dd7f7b
git diff --cached  # check that it looks okay
git commit

When you push it to github, you'll have to use the -f flag.

pphaneuf commented 10 years ago

Pull requests map a feature branch (in this case, the branch named "master" in your repository) to a destination branch (our "master"). All you need to do to update the pull request is push to the feature branch. I have merged it in, thanks!

That's another reason why you should always make a branch to work in, rather than use the "master" branch. If you don't, and put all your work in "master", your pull requests will have everything all jumbled up together...

I've seen this many times, patches or pull requests with many features mixed in together, where the project maintainers wanted most of them, but disagreed about one thing, and so couldn't merge it in. Sending smaller, separate pull requests, allows for accepting all the contributions that are not controversial, while discussion and further improvements are done with the controversial ones. :smiley: