by phantombeta » Sun Sep 13, 2015 7:22 pm
I can't remember exactly what to do, but I think this should work:
- Create a new empty repo in SmartGit. (Don't link it to the GitHub repo yet.)
- Add ZDoom's repo as a new remote. (Remote>Add...)
- Pull everything from the new remote. (Right click the remote in the branches view then click "Pull...")
- Double click the branch you want to make a pull request for in the Branches view to checkout the branch.
- It should now ask if you want to create a local branch or not.
- Choose "Create local branch".
- Add a new branch with the name you want. (Branch>Add Branch... or F7)
- Add a new remote with the name "origin" and link it to your fork of the GZDoom repo.
- Push the branch. (There should be a big "Push" button in the main view) When it asks you what to do, click "Configure".
- The origin remote (Your GitHub repo) should now have a new branch that is up to date with the branch you're making the pull request for.
Make your changes, commit and push like normal. You should be able to use TortoiseGit after the last step.
To make a new branch for a pull request, do it again from step 3. (Skip step 8)
To make the pull request for ZDoom, go to the main page of the GitHub repo. It should show the new branches. Click the "Compare & Pull Request" button next to the branch you want and make the pull request.
In the "Comparing changes" page, change the "Base" branch to the one you want to make a pull request for.
I can't remember exactly what to do, but I think this should work:
[list]
[*]Create a new empty repo in SmartGit. (Don't link it to the GitHub repo yet.)
[*]Add ZDoom's repo as a new remote. (Remote>Add...)
[*]Pull everything from the new remote. (Right click the remote in the branches view then click "Pull...")
[*]Double click the branch you want to make a pull request for in the Branches view to checkout the branch.
[*]It should now ask if you want to create a local branch or not.
[*]Choose "Create local branch".
[*]Add a new branch with the name you want. (Branch>Add Branch... or F7)
[*]Add a new remote with the name "origin" and link it to your fork of the GZDoom repo.
[*]Push the branch. (There should be a big "Push" button in the main view) When it asks you what to do, click "Configure".
[*]The origin remote (Your GitHub repo) should now have a new branch that is up to date with the branch you're making the pull request for.[/list]
Make your changes, commit and push like normal. You should be able to use TortoiseGit after the last step.
To make a new branch for a pull request, do it again from step 3. (Skip step 8)
To make the pull request for ZDoom, go to the main page of the GitHub repo. It should show the new branches. Click the "Compare & Pull Request" button next to the branch you want and make the pull request.
In the "Comparing changes" page, change the "Base" branch to the one you want to make a pull request for.