Software Repositories: Difference between revisions

Software Repositories (view source)

Revision as of 11:12, 29 October 2013

508 bytes added , 29 October 2013

More on git

Domain Admins, Domain Users, confluence-administrators, confluence-users, crowd-administrators, jira-administrators, jira-developers, jira-users, stash-administrators, stash-users

33

edits

@@ Line 1: / Line 1: @@
 YSTV maintain two software version control systems, [http://en.wikipedia.org/wiki/Apache_Subversion SVN] and [http://en.wikipedia.org/wiki/Git_(software) Git], which are used for development of our in-house software and the website.
+=Git=
+Git is a distributed version control system allowing multiple people to modify code at the same time without needed access to the server. You clone the main repository to you machine via ssh, using a url like <user.name>@ystv.co.uk:/data/git/<PROJECTNAME>.git. Once you've made your changes you can '''commit''' locally before '''pushing''' to the server. You may need to pull first if someone has made changes in the interim, normally merging is automated but occasionally you'll need to manually merge sections that have been modified by multiple people.
+==Software==
+Unless you've used git in the past you'll probably want to use a GUI to interface with git. There are plenty available such as:
+* [http://www.syntevo.com/smartgithg/ SmartGit]
+* [https://code.google.com/p/tortoisegit/ Tortoisegit] If you're used to tortoise SVN you'll feel right at home
+* [http://windows.github.com/ Github for Windows] (Not just for Github)
 =SVN=
@@ Line 40: / Line 49: @@
 Trac is primarily a bug tracker, so hit View Tickets to review all of the known bugs for that project. Some of the bugs on file have been fixed in the code but not closed on the tracker, or no longer apply, if you find one feel free to close it. Also, see the note above about log messages, if you include "fixes #XXX" in an SVN commit log message, trac will close the ticket for you and add your commit log to the end.
-=Git=
-Git is like SVN but distributed and harder to use. You access it over ssh, something like ssh://user.name@ystv.co.uk:/data/git/PROJECTNAME.git and use <code>git clone</code> for checking out, <code>git pull</code> for update and <code>git commit</code> for commit, however this only commits to your local working copy, after you are happy with that run <code>git push</code> to push all your commits up to the server copy.
 [[Category:Computing]]