search

michaelbutler / minesweeper

WebWorker powered Minesweeper game written in JavaScript, HTML and CSS.
https://michaelbutler.github.io/minesweeper/
GNU General Public License v3.0
39 stars 31 forks source link

Implement suggested improvements #9

Closed FixItDik closed 8 years ago

FixItDik commented 8 years ago

Hi Michael, this is my first time using GitHub so forgive me if I am not going about this the right way, but in your email you used the phrase "send me a pull request" and I figured this was the way to achieve that. I am assuming you will then create a fork, probably based on the gh-pages branch (?) and then grant me access to upload my fixed code to that new branch for you to review - is that right?

michaelbutler commented 8 years ago

no, this is not the right way. Let me explain here. The gh-pages branch is a special branch used by github to show http://michaelbutler.github.io/ It should basically be the code in master, plus extra index.html files and so on. You can essentially ignore the gh-pages branch and just look at master.

Steps to follow:

  1. Go to https://github.com/michaelbutler/minesweeper
  2. In the top-right corner, click "Fork"
  3. After a few seconds you'll have your very own minesweeper repository clone that you are free to do whatever you want with! It will be called FixItDik/minesweeper
  4. Now click the green "Clone or Download" button
  5. Using the https or ssh url given you can bring the code down to your local machine to work on.
  6. Change and commit your code with git add, git commit, and git push -- typically git commands.
  7. After you are satisfied with your changes (please don't change too many things in a single pull request, do a pull request for each significant feature), go to https://github.com/michaelbutler/minesweeper and click "New Pull Request"
  8. On the left side it should say Base Fork: michaelbutler/minsweeper base: master and on the right side it should say Base Fork: FixItDik/minesweeper base: master.
  9. Write a description about your change and how to test the feature.
  10. Click the green submit pull request button and that's it!

For more information, google "how to collaborate code on github".

P.S. It's called a "pull request" because you are wanting me to "pull" in your changes into "my" master branch. I could just as well submit a "pull request" to your repo, if I wanted you to "pull" my changes into "your" master branch.

FixItDik commented 8 years ago

Thanks for your patience Michael – I did the first 5 steps no problem but not sure where I am meant to enter the git commands so I am guessing I can equally change my local copy of the code (downloaded in step 5 as a ZIP file) and then use the “upload files” button to upload the changed files – but don’t worry, it is not your place to teach me how to use GutHub, I will go read the documentation (when I get a mo – real work just kicked back in so may be a few days now – you’ll be breathing a sigh of relief at that I am sure J)

Thanks again mate

Dik

From: Michael Butler [mailto:notifications@github.com] Sent: 19 July 2016 16:18 To: michaelbutler/minesweeper minesweeper@noreply.github.com Cc: Dik fixitdik@gmail.com; Author author@noreply.github.com Subject: Re: [michaelbutler/minesweeper] Implement suggested improvements (#9)

no, this is not the right way. Let me explain here. The gh-pages branch is a special branch used by github to show http://michaelbutler.github.io/ It should basically be the code in master, plus extra index.html files and so on. You can essentially ignore the gh-pages branch and just look at master.

Steps to follow:

  1. Go to https://github.com/michaelbutler/minesweeper
  2. In the top-right corner, click "Fork"
  3. After a few seconds you'll have your very own minesweeper repository clone that you are free to do whatever you want with! It will be called FixItDik/minesweeper
  4. Now click the green "Clone or Download" button
  5. Using the https or ssh url given you can bring the code down to your local machine to work on.
  6. Change and commit your code with git add, git commit, and git push -- typically git commands.
  7. After you are satisfied with your changes (please don't change too many things in a single pull request, do a pull request for each significant feature), go to https://github.com/michaelbutler/minesweeper and click "New Pull Request"
  8. On the left side it should say Base Fork: michaelbutler/minsweeper base: master and on the right side it should say Base Fork: FixItDik/minesweeper base: master.
  9. Write a description about your change and how to test the feature.
  10. Click the green submit pull request button and that's it!

For more information, google "how to collaborate code on github".

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/michaelbutler/minesweeper/pull/9#issuecomment-233666295 , or mute the thread https://github.com/notifications/unsubscribe-auth/ATlTHxctY9I5hOytKmHEo3M5AjQhYvRDks5qXOqOgaJpZM4JPhm8 . https://github.com/notifications/beacon/ATlTH5w_I9zQwZk8i1OQuyZ7l0SvIiEOks5qXOqOgaJpZM4JPhm8.gif