Guide to FS Open and git - Revision history

PIe: /* Getting the source: Tortoise Git */

2018-09-02T21:38:47Z

‎Getting the source: Tortoise Git

Niffiwan: /* Sync changes with upstream */ provide both options, and yes, I'm not fond of using --force for routine tasks, that damn command is too dangerous

2015-12-29T21:22:49Z

‎Sync changes with upstream: provide both options, and yes, I'm not fond of using --force for routine tasks, that damn command is too dangerous

DahBlount: /* Sync changes with upstream */

2015-12-29T07:05:53Z

‎Sync changes with upstream

Niffiwan: /* Sync changes with upstream */

2015-11-04T03:51:10Z

‎Sync changes with upstream

Niffiwan: /* Syncing: Tortoise Git */

2015-11-04T03:48:48Z

‎Syncing: Tortoise Git

Yarn: Added missing steps to the "Pulling" section

2015-09-15T02:34:36Z

Added missing steps to the "Pulling" section

Z64555: /* Collaboration with remotes: Tortoise Git */ Added subsections on forking and collaborating

2015-09-08T18:13:21Z

‎Collaboration with remotes: Tortoise Git: Added subsections on forking and collaborating

Niffiwan: /* Simple Development: Tortoise Git */

2015-08-27T03:53:41Z

‎Simple Development: Tortoise Git

Niffiwan: /* Simple Development: Tortoise Git */

2015-08-27T03:51:58Z

‎Simple Development: Tortoise Git

Niffiwan: /* Getting the source: Tortoise Git */

2015-08-27T03:45:28Z

‎Getting the source: Tortoise Git

@@ Line 5: / Line 5: @@
 {{note|this is intended for people who want to get the code and compile executables.  If you want to write code & submit patches, see the [[Guide_to_FS_Open_and_git#Simple_Development:_Tortoise_Git | next section]] }}
-* Download and install [http://msysgit.github.io/ Git For Windows] (this is a dependency for TortoiseGit)
+* Download and install [https://gitforwindows.org/ Git For Windows] (this is a dependency for TortoiseGit)
-* Download and install [http://code.google.com/p/tortoisegit/ TortoiseGit] (you probably need to reboot after installing)
+* Download and install [https://tortoisegit.org/ TortoiseGit] (you probably need to reboot after installing)
 {{gitdocostep | image=[[File:Git-clone-1a.png]] | text=

@@ Line 270: / Line 270: @@
 This section will go over synchronizing your local git development branch with the changes made to the official master branch.
 {{gitdocostep | image=none | text=
@@ Line 277: / Line 282: @@
 {{gitdocostep | image=none | text=
-Rebase the changes onto your local branch directly from master (Recommended - If you do this, go directly to Resolve any conflicts, before pushing the changes)
+Merge those changes with your local master (possibly optional)
 |cmdlinetxt=git checkout YOUR_BRANCH; git rebase upstream/master
 }}
@@ Line 295: / Line 318: @@
 |cmdlinetxt=(see the relevant section)
 }}
 <div style="clear: both"></div>

@@ Line 274: / Line 274: @@
 Fetch the changes in the official/upstream master branch
 |cmdlinetxt=git fetch upstream master
 }}

@@ Line 273: / Line 273: @@
 {{gitdocostep | image=none | text=
 Fetch the changes in the official/upstream master branch
 }}
 <div style="clear: both"></div>

@@ Line 263: / Line 263: @@
 {{gitdocostep | image=[[File:Git-push-conflict-16.png]] | text=
 Success!
 }}

@@ Line 147: / Line 147: @@
 * Right click on your local repo dir
 * Select TortoiseGit -> Settings
 }}

@@ Line 263: / Line 263: @@
 == Collaboration with remotes: Tortoise Git ==
+=== Forking a Branch ===
 Here we'll go through:
@@ Line 317: / Line 317: @@
 {{gitdocostep | image=[[File:Git-remotebranch-5.png]] | text=
 * When the commit is completed there will be a button to "Push" your branch.
-* You probably won't have permission to push to the other persons remote branch, so push to your own remote repository
+* If this is your first time pulling from the other persons remote, you probably won't have permission to push to it. We'll push to your own remote repository for the time being.
 * Optionally change the remote branch name (e.g. with a reference to the remote it can from)
 * Select "Origin" as your "Destination" -> "Remote"
@@ Line 344: / Line 344: @@
 }}
 <div style="clear: both"></div>
 == Patches: TortoiseGit ==

@@ Line 60: / Line 60: @@
 {{gitdocostep | image=[[File:Git-commit-2a.png]] | text=
 * Review your changes by double-clicking on all the files listed in the new window (ensure no unwanted changes have snuck in!).
 }}
 {{gitdocostep | image=[[File:Git-commit-3.png|900px]] | text=
 * This is how the diff will be displayed (using TortoiseGitMerge, which is also used to resolve conflicts)
 }}

@@ Line 30: / Line 30: @@
 * Go to the [https://github.com github webpage] and create an account
 * Go to the [https://github.com/scp-fs2open/fs2open.github.com FSO repository on github] and click on Fork
 }}
 {{gitdocostep | image=[[File:Github-fork-2.png|900px]] | text=
 * Record the URL for your newly forked copy of the FSO repository
 }}
@@ Line 41: / Line 43: @@
 * Right click on the repository directory and select TortoiseGit -> Create Branch
 ** Note: all development should be done in a new branch, instead of being done in the "master" branch. It's just simpler
 }}
 {{gitdocostep | image=[[File:Git-branch-2a.png]] | text=
 * In the new window, enter the name for the new branch, verify that the branch is based on HEAD (master) and check the "Switch to new branch" box
 }}
@@ Line 51: / Line 55: @@
 * Test your new code
 * When you're happy with the code, right click on the repository directory and select TortoiseGit -> Diff
 }}
@@ Line 65: / Line 70: @@
 * When your review is complete, press "Commit" (in the same window that you double clicked on all the changed files)
 * In the new window, add a commit message and press OK
 }}
 {{gitdocostep | image=[[File:Git-commit-5a.png]] | text=
 * When the commit is complete, press the "push" button to send your commit(s) to your github repository
 }}
@@ Line 75: / Line 82: @@
 * If you want to, you can give the public remote branch a different name to your local branch (this can be useful when rebasing a branch already published to your public repository)
 * Finally, press OK
 }}
 {{gitdocostep | image=[[File:Git-commit-7a.png|900px]] | text=
 * Go to your Github Repository webpage and select the branch you just pushed
 }}
 {{gitdocostep | image=[[File:Git-commit-8a.png|900px]] | text=
 * When you have the correct branch selected, click on the "Pull/Review/Compare" button
 }}
 {{gitdocostep | image=[[File:Git-commit-8a.png|900px]] | text=
 * Now click on "Create Pull Request"
 }}
@@ Line 93: / Line 104: @@
 {{gitdocostep | image=[[File:Git-commit-10.png|900px]] | text=
 * Add comments to the pull request if you wish, then click "Send Pull Request"
 }}

@@ Line 12: / Line 12: @@
 ** You'll need a fair bit of space for the code + the intermediate files when building it.
 * Press right mouse and choose Git Clone from the list.
 }}
@@ Line 18: / Line 19: @@
 ** (https://github.com/scp-fs2open/fs2open.github.com.git)
 * Press OK to begin downloading from the repository (this may take a few minutes, depending on the speed of your internet connection)
 }}
 <div style="clear: both"></div>