Software Repository - Revision history

Ed at 20:06, 13 March 2017

2017-03-13T20:06:30Z

Ed at 16:44, 13 March 2017

2017-03-13T16:44:09Z

Ed at 16:43, 13 March 2017

2017-03-13T16:43:53Z

Ed at 16:41, 13 March 2017

2017-03-13T16:41:10Z

Ed at 16:40, 13 March 2017

2017-03-13T16:40:59Z

Ed at 16:30, 13 March 2017

2017-03-13T16:30:15Z

Ed at 16:29, 13 March 2017

2017-03-13T16:29:21Z

Ed at 16:25, 13 March 2017

2017-03-13T16:25:36Z

Ed at 16:24, 13 March 2017

2017-03-13T16:24:09Z

ChristyW at 17:28, 20 January 2017

2017-01-20T17:28:31Z

← Older revision		Revision as of 20:06, 13 March 2017
Line 1:		Line 1:
	[[Category: McNair Admin]]		[[Category: McNair Admin]]
−
	For a listing of all software tools and scripts see [[Software Repository Listing]].		For a listing of all software tools and scripts see [[Software Repository Listing]].

@@ Line 19: / Line 19: @@
 ===Using a Git Client===
-We have Git.exe and Sourcetree installed on the RDP. To run Git through the command line, follow the instructions below (ignore the section that says ''''installing''''.
+We have Git.exe and Sourcetree installed on the RDP. To run Git through the command line, follow the instructions below (ignore the section that says ''installing'').
 ==Our Git workflow==

@@ Line 19: / Line 19: @@
 ===Using a Git Client===
-We have GitBash and Sourcetree installed on the RDP.
+We have Git.exe and Sourcetree installed on the RDP. To run Git through the command line, follow the instructions below (ignore the section that says ''''installing''''.
 ==Our Git workflow==

@@ Line 8: / Line 8: @@
 *From the RDP: https://localhost/codebase/
 *From the anywhere: https://rdp.mcnaircenter.org/codebase/ or https://128.42.44.182/codebase/
 ==Our Git Server==

@@ Line 8: / Line 8: @@
 *From the RDP: https://localhost/codebase/
 *From the anywhere: https://rdp.mcnaircenter.org/codebase/ or https://128.42.44.182/codebase/
 ==Our Git Server==
-We have our git server on the RDP machine. Here are the admin credentials:
+We have our git server on the RDP machine.
-*Username: '''boss'''
-*Name: '''Ed'''
+===Access through a web browser===
 To access this from your computer and not the RDP you can go to http://128.42.44.182/codebase where it will prompt you for your username and password. '''You can also use https://128.42.44.182/codebase which is preferable'''. The browser will show a security error because we have a self signed certificate. This is ok if we are restricted to intranet. If we want to allow public access, we probably need to get a certificate from a Certificate Authority like Verisign etc.
 ==Our Git workflow==
@@ Line 94: / Line 95: @@
 **default credentials are ''username'': '''admin''', ''password'': '''admin'''
 **[6-22-2016]: Can also use https://localhost/codebase which is preferable, otherwise username/passwords are transmitted plain text. The browser will show a security error because we have a self signed certificate. This is ok if we are restricted to intranet. If we want to allow public access, we probably need to get a certificate from a Certificate Authority like Verisign etc.

@@ Line 3: / Line 3: @@
 For a listing of all software tools and scripts see [[Software Repository Listing]].
-==Background==
+==Quick Connection Instructions==
-To enforce efficient source control we(Ed) chose to host our own git server on the RDP machine using [https://bonobogitserver.com/ Bonobo Git Server] that makes use of the windows IIS platform and is open source.
+All of the following links go to the same place. Https is preferred as otherwise passwords are passed plain text.
-Installing Bonobo git server is pretty simple:
+==Our Git Server==
-==Our Git Server==
+We have our git server on the RDP machine. Here are the admin credentials:
 *Username: '''boss'''
 *Name: '''Ed'''
@@ Line 41: / Line 23: @@
 ==Our Git workflow==
 We chose a simple git workflow.
@@ Line 79: / Line 62: @@
 </div>
 <div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git rm -r <foldername></big></code></div>
 </div>
 ==Useful Links==
 * [http://learngitbranching.js.org/ A cool interactive tutorial for git]
 * For those who are experienced with svn check out the [http://git.or.cz/course/svn.html svn-git comparison]
 [[admin_classification::IT Build| ]]

@@ Line 45: / Line 45: @@
 Our aim is not to break things in the master branch. All commits on the master should work.
-.
+#When adding a new feature or fixing a bug, ALWAYS check out a new feature branch from the master. NEVER checkout a feature branch from next (see below). The feature branch should be named user/feature_name.
-.
+#After feature development is complete merge your feature-branch into next.
-.
+#The next branch is intended for testing and confirming things do not break. So, after feature branches are merged into next and conflicts resolved, we merge into master. After this, you can end the feature branches if you want.
 ==Quick and dirty github tutorial==
 *''Installing - '' Depending on your operating system you can install git in three different ways:
@@ Line 72: / Line 63: @@
 * to checkout code from remote repository, use the <code><big>git clone</big></code> command. This will create a local repository on your disk as well as download the source code of the project you wish to work on. Here's an example:
 <div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git clone http://128.42.44.182/codebase/Matcher.git</big></code></div>
 * to update your repository to include others' work in your project use the <code><big>git pull</big></code> command. Its always a good practice to update your code before you commit to ensure that others' code doesn't break yours. Also, you cannot push to remote unless your local repository is up to date. If you commit on a stale local repository that is fine, just that this would mean you are likely to have more trouble merging your code with others later on thanks to all the conflicts that you'll face when you actually try to update your repository later. See example:
 <div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git pull <optional folder path></big></code></div>
 * to commit your changes to your local repository use the <code><big>git commit</big></code> command. Committing your changes is an essential step whether you are adding/removing items from the repository or changing existing items. See example :
 <div style="text-align: left; direction: ltr; margin-left: 5em;"><code><big>git commit -m "mandatory commit message"</big></code></div>

@@ Line 1: / Line 1: @@
 [[Category: McNair Admin]]
-For a listing of all software tools and scripts see [[Software Repository Listing]] / [[Software Repository Listing 2]].
+For a listing of all software tools and scripts see [[Software Repository Listing]].
 ==Background==