Version Control - Revision history

Alchemyst at 06:05, 5 April 2019

2019-04-05T06:05:34Z

Alchemyst: Rework to reflect 2019 reality

2019-04-05T06:04:01Z

Rework to reflect 2019 reality

Alchemyst: Added link to Git Youtube videos

2016-05-06T09:34:21Z

Added link to Git Youtube videos

Alchemyst: /* Windows */

2013-03-27T08:59:33Z

‎Windows

Alchemyst: /* Git */

2012-03-13T10:30:22Z

‎Git

137.215.117.54 at 21:39, 26 January 2012

2012-01-26T21:39:54Z

137.215.117.54: Created page with '=== Description === Version control is used to manage multiple versions of a number files during a project. A version control system provides two primary data management capab…'

2012-01-26T21:26:17Z

Created page with '=== Description === Version control is used to manage multiple versions of a number files during a project. A version control system provides two primary data management capab…'

New page

=== Description ===

Version control is used to manage multiple versions of a number files during a project. A version control system provides two primary data management capabilities. It allows users to lock files so they can only be edited by one person at a time, or track changes to files made by various persons at the same time.

=== Motivation ===

If you are the only author of a file then there is very little reason to implement version control. If, however, you are collaborating with other individuals it becomes important to keep track of each persons contribution. More importantly if two people are working on the same file we must ensure that the work done by one person is not overwritten by that of the other when both parties save their modifications.

In such cases version control may be used to manage this. Version control may take either of the following strategies to do this
* The first method allows one person to lock the file while they edit it, preventing anyone else from editing it.
* The second method allows everyone to edit a copy of the file individually and then later combine all these efforts in an intelligent manner.

Wikipedia offers the following [http://en.wikipedia.org/wiki/Comparison_of_revision_control_software comparison] between the various systems. On Campus we use mostly use Git, a good argument fo it is to be found at [http://stackoverflow.com/questions/315911/git-for-beginners-the-definitive-practical-guide/2678236#2678236 Stackoverflow]

=== Git ===

We store all our repositories on [https://github.com/ GitHub], please create an account. After creating an account you will want to create a repository, this is a little less straight forward and depends on which operating system you are using

''' Windows '''

Git on windows is mainly managed by the Git interface, though this is a little cumbersome if you're not used to the command prompt and it is recommended that you try out tortoise git as a GUI generation friendly alternative. The best instrucitons for such an installation are provided [http://dbanck.de/2009/10/08/github-windows-and-tortoisegit-part-1-installing-pulling/ here] and on the git hub site itself.

For now there seems to be an issue with the proxy which I'm still resolving.

← Older revision		Revision as of 06:05, 5 April 2019
Line 18:		Line 18:
	git config --global http.proxy "http://firewallusername:firewallpassword@cache.up.ac.za:8080"		git config --global http.proxy "http://firewallusername:firewallpassword@cache.up.ac.za:8080"
	2. Use the https links for your project rather than the ssh link. You may be prompted for a password - this is your github password. If you don't like typing it every time, just use a similar format as above for your repository access.		2. Use the https links for your project rather than the ssh link. You may be prompted for a password - this is your github password. If you don't like typing it every time, just use a similar format as above for your repository access.
		+
		+	[[File:github_https.png]]

← Older revision		Revision as of 08:59, 27 March 2013
Line 26:		Line 26:
	==== Windows ====		==== Windows ====

−	~~Git on windows is mainly managed by the Git interface, though this is a little cumbersome if you're not used to the command prompt and it~~ is recommended that you ~~try out~~ [http://~~code~~.~~google~~.com/~~p/tortoisegit/ tortoise git~~] ~~as a GUI generation friendly alternative. The best instrucitons for such an installation~~ are ~~provided [http://dbanck~~.~~de/2009/10/08/github-windows-~~and~~-tortoisegit-part-1-installing-pulling/ here] and [http://help~~.~~github~~.~~com/~~set-up~~-git-redirect on~~ the ~~GitHub site] itself~~.	+	It is recommended that you use the official [http://windows.github.com/ GitHub for Windows] application to manage your repositories that are on GitHub. This installer will also install the commandline git applications, which you can access from Powershell on Windows 7 and above, or from cmd.exe on older versions of Windows.
		+
		+	In order to be able to use GitHub through the [[Campus Proxy Servers]], you may need to set up the proxy from the commandline as shown above.

@@ Line 13: / Line 13: @@
 Wikipedia offers the following [http://en.wikipedia.org/wiki/Comparison_of_revision_control_software comparison] between the various systems. On Campus we use mostly use Git, a good argument fo it is to be found at [http://stackoverflow.com/questions/315911/git-for-beginners-the-definitive-practical-guide/2678236#2678236 Stackoverflow]
-=== Git ===
+=== Git/Github ===
 We store all our repositories on [https://github.com/ GitHub], please create an account. After creating an account you will want to create a repository, this is a little less straight forward and depends on which operating system you are using
-''' Windows '''
+==== Proxy configuration ====
-Git on windows is mainly managed by the Git interface, though this is a little cumbersome if you're not used to the command prompt and it is recommended that you try out tortoise git as a GUI generation friendly alternative. The best instrucitons for such an installation are provided [http://dbanck.de/2009/10/08/github-windows-and-tortoisegit-part-1-installing-pulling/ here] and on the git hub site itself.
+. Issue the following command:
-Note : There seems to be an issue with the proxy which I'm  still resolving.
+==== Windows ====

← Older revision		Revision as of 21:39, 26 January 2012
Line 21:		Line 21:
	Git on windows is mainly managed by the Git interface, though this is a little cumbersome if you're not used to the command prompt and it is recommended that you try out tortoise git as a GUI generation friendly alternative. The best instrucitons for such an installation are provided [http://dbanck.de/2009/10/08/github-windows-and-tortoisegit-part-1-installing-pulling/ here] and on the git hub site itself.		Git on windows is mainly managed by the Git interface, though this is a little cumbersome if you're not used to the command prompt and it is recommended that you try out tortoise git as a GUI generation friendly alternative. The best instrucitons for such an installation are provided [http://dbanck.de/2009/10/08/github-windows-and-tortoisegit-part-1-installing-pulling/ here] and on the git hub site itself.

−	~~For now there~~ seems to be an issue with the proxy which I'm still resolving.	+	Note : There seems to be an issue with the proxy which I'm still resolving.

@@ Line 1: / Line 1: @@
 === Description ===
-Version control is used to manage multiple versions of a number files during a project.  A version control system provides two primary data management capabilities.  It allows users to lock files so they can only be edited by one person at a time, or track changes to files made by various persons at the same time.
+Version control is used to manage multiple versions of a number files during a project and exchange changes between collaborators.
-=== Motivation ===
+=== Git ===
-If you are the only author of a file then there is very little reason to implement version control.  If, however, you are collaborating with other individuals it becomes important to keep track of each persons contribution. More importantly if two people are working on the same file we must ensure that the work done by one person is not overwritten by that of the other when both parties save their modifications.
+This [https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx video series] is an excellent place to start learning about installing and using Git.
-−
-In such cases version control may be used to manage this. Version control may take either of the following strategies to do this
-* The first method allows one person to lock the file while they edit it, preventing anyone else from editing it.
-* The second method allows everyone to edit a copy of the file individually and then later combine all these efforts in an intelligent manner.
-−
-Wikipedia offers the following [http://en.wikipedia.org/wiki/Comparison_of_revision_control_software comparison] between the various systems. On Campus we use mostly use Git, a good argument fo it is to be found at [http://stackoverflow.com/questions/315911/git-for-beginners-the-definitive-practical-guide/2678236#2678236 Stackoverflow]
-−
-=== Git ===
 This [https://www.youtube.com/playlist?list=PL6gx4Cwl9DGAKWClAD_iKpNC0bGHxGhcx video series] is an excellent place to start learning about installing and using Git
 === Github ===
-We store all our repositories on [https://github.com/ GitHub], please create an account. After creating an account you will want to create a repository, this is a little less straight forward and depends on which operating system you are using
+We store all our repositories on [https://github.com/ GitHub], please create an account.
 ==== Proxy configuration ====
-In order for Git to be able to access the Github servers you need to do two things:
+In order to be able to use GitHub through the [[Campus Proxy Servers]], you may need to set up the proxy from the commandline:
 . Issue the following command:
    git config --global http.proxy "http://firewallusername:firewallpassword@cache.up.ac.za:8080"
 . Use the https links for your project rather than the ssh link.  You may be prompted for a password - this is your github password.  If you don't like typing it every time, just use a similar format as above for your repository access.