Goonhub
03-10-2016, 01:23 PM
(This post was last modified: 03-10-2016, 01:24 PM by Marquesas. Edited 1 time in total.)
In order to make this go as smooth as possible, we'd like to have admissible git patches.
The simplest way for someone new to version control to create a git patch is as follows:
- Register on https://github.com
- Fork https://github.com/goonstation/goonstation-2016 into your account by pressing the Fork button in the top right. You should note that now the URL changed to https://github.com/<your_account_name>/goonstation-2016
- Create a new branch from master. To do this, click the Branches button in the top left of the source files and ensure that master is selected. Then type a branch name (eg. 'some-dumb-feature') into the branch name box and click the Create Branch button. You should note that the branch dropdown box now says Branch: some-dumb-feature. This is where you should place your work.
- The easiest way you can modify code is by opening a file and pressing the pencil (edit) button in the top right. Always ensure that you are working into the branch that you previously created. You can verify this by scrolling to the button and checking the name next to the 'Commit directly to the branch-name branch' radio button.
- When you are done editing a file, make sure that 'Commit directly to the branch-name branch' is selected at the bottom and type any message into the first box.
- In order to test changes that you did on this branch, you can use the Download ZIP button in the file browser on the top right (make sure the appropriate branch is selected in the branch dropdown box) to download the revision.
- When you believe you're done, press the New Pull Request button. This will take you to a new screen. Here, there will be either two or four dropdown boxes. If there are two boxes, click the Compare across forks link at the top. If there are four boxes, you are okay. The base fork selected should be 'goonstation/goonstation-2016'. The base that should be selected is master. The head fork that should be selected is '<your-account-name>/goonstation-2016'. The head that should be selected is '<your-branch-name>'. If all four boxes show the correct selection, copy the URL and append it to the end of your patch post.
If you do this, you give us an easy and painless way to merge your changes into our repository.
The simplest way for someone new to version control to create a git patch is as follows:
- Register on https://github.com
- Fork https://github.com/goonstation/goonstation-2016 into your account by pressing the Fork button in the top right. You should note that now the URL changed to https://github.com/<your_account_name>/goonstation-2016
- Create a new branch from master. To do this, click the Branches button in the top left of the source files and ensure that master is selected. Then type a branch name (eg. 'some-dumb-feature') into the branch name box and click the Create Branch button. You should note that the branch dropdown box now says Branch: some-dumb-feature. This is where you should place your work.
- The easiest way you can modify code is by opening a file and pressing the pencil (edit) button in the top right. Always ensure that you are working into the branch that you previously created. You can verify this by scrolling to the button and checking the name next to the 'Commit directly to the branch-name branch' radio button.
- When you are done editing a file, make sure that 'Commit directly to the branch-name branch' is selected at the bottom and type any message into the first box.
- In order to test changes that you did on this branch, you can use the Download ZIP button in the file browser on the top right (make sure the appropriate branch is selected in the branch dropdown box) to download the revision.
- When you believe you're done, press the New Pull Request button. This will take you to a new screen. Here, there will be either two or four dropdown boxes. If there are two boxes, click the Compare across forks link at the top. If there are four boxes, you are okay. The base fork selected should be 'goonstation/goonstation-2016'. The base that should be selected is master. The head fork that should be selected is '<your-account-name>/goonstation-2016'. The head that should be selected is '<your-branch-name>'. If all four boxes show the correct selection, copy the URL and append it to the end of your patch post.
If you do this, you give us an easy and painless way to merge your changes into our repository.