Using Github and Git for Code - Revision history

Davebrid: updated with instructions about pulling in from remote repositories.

2013-12-05T14:22:01Z

updated with instructions about pulling in from remote repositories.

← Older revision		Revision as of 14:22, 5 December 2013
Line 10:		Line 10:

	==Making Changes to Code==		==Making Changes to Code==
			* When starting to make changes, to avoid conflicts update your current repository by pulling in the remote branches (presumes branch named master and remote named origin):
			<pre>git pull origin master</pre>
			* To check the status of your repository enter:
			<pre>git status</pre>
			* To determine the current branches and the names of your remote repository:
			<pre>git branch</pre>
			<pre>git remote -v</pre>
	* It is generally best practice to work on a branch for each improvement, then merge that back into a working master branch once you are finished.		* It is generally best practice to work on a branch for each improvement, then merge that back into a working master branch once you are finished.
	* Create a branch. Each branch is a complete clean version of the code, and will not affect other branches.		* Create a branch. Each branch is a complete clean version of the code, and will not affect other branches. Pick a name that describes the changes you plan to make.
	<pre>git branch [name of your new branch]</pre>		<pre>git branch [name of your new branch]</pre>
	* Switch to that branch		* Switch to that branch
	<pre>git checkout [name of the branch you want to switch to]</pre>		<pre>git checkout [name of the branch you want to switch to]</pre>
	* Make some changes to a file and save it (i use Notepad++ in windows and Gedit in linux)		* Make some changes to a file and save it (i use Notepad++ in windows and Gedit or vim in linux)
	* Commit the changes. This saves those changes to your revision history. This is useful to find out when changes happened and to go back to when things were working. You want to commit often! Try to make the message useful, as in I did X to Y. Try not to do "changed stuff" or "fixed some mistakes"		* Commit the changes. This saves those changes to your revision history. This is useful to find out when changes happened and to go back to when things were working. You want to commit often! Try to make the message useful, as in I did X to Y. Try not to do "changed stuff" or "fixed some mistakes"
	<pre>git commit -m "This is the message describing the commit"</pre>		<pre>git commit -m "This is the message describing the commit"</pre>
	* Intermittently push those changes back to Github (especially if you are working on a couple of computers)		* Intermittently push those changes back to Github (especially if you are working on a couple of computers; this presumes that your remote is named origin, which is the default):
	<pre>git push origin [name of your new branch]</pre>		<pre>git push origin [name of your new branch]</pre>
	* Once you are done working on a branch go back to your original branch (normally master) and pull in changes from your modified branch. Once its working, you can optionally delete the branch if you dont think you are going to need it in the future.		* Once you are done working on a branch go back to your original branch (normally master) and pull in changes from your modified branch. Once its working, you can optionally delete the branch if you dont think you are going to need it in the future.
Line 26:		Line 33:
	git branch -d [name of branch you want to delete]		git branch -d [name of branch you want to delete]
	</pre>		</pre>



	~~==Merging Changes Made in Other Branches==~~

Davebrid: made references into a list

2012-03-05T21:04:42Z

made references into a list

← Older revision		Revision as of 21:04, 5 March 2012
Line 4:		Line 4:

	==Useful References==		==Useful References==
	Github cheatsheet - http://help.github.com/git-cheat-sheets/		* Github cheatsheet - http://help.github.com/git-cheat-sheets/
	Git manual - http://schacon.github.com/git/user-manual.html		* Git manual - http://schacon.github.com/git/user-manual.html
	Git installation - http://help.github.com/linux-set-up-git/		* Git installation - http://help.github.com/linux-set-up-git/
	Forking an existing repository - http://help.github.com/fork-a-repo/		* Forking an existing repository - http://help.github.com/fork-a-repo/

	==Making Changes to Code==		==Making Changes to Code==

Davebrid: wori

2012-03-05T21:03:42Z

wori

New page

[[Category: Coding]]
[[Category: Bioinformatics]]
[[Category: Github]]

==Useful References==
Github cheatsheet - http://help.github.com/git-cheat-sheets/
Git manual - http://schacon.github.com/git/user-manual.html
Git installation - http://help.github.com/linux-set-up-git/
Forking an existing repository - http://help.github.com/fork-a-repo/

==Making Changes to Code==
* It is generally best practice to work on a branch for each improvement, then merge that back into a working master branch once you are finished.
* Create a branch. Each branch is a complete clean version of the code, and will not affect other branches.
<pre>git branch [name of your new branch]</pre>
* Switch to that branch
<pre>git checkout [name of the branch you want to switch to]</pre>
* Make some changes to a file and save it (i use Notepad++ in windows and Gedit in linux)
* Commit the changes. This saves those changes to your revision history. This is useful to find out when changes happened and to go back to when things were working. You want to commit often! Try to make the message useful, as in I did X to Y. Try not to do "changed stuff" or "fixed some mistakes"
<pre>git commit -m "This is the message describing the commit"</pre>
* Intermittently push those changes back to Github (especially if you are working on a couple of computers)
<pre>git push origin [name of your new branch]</pre>
* Once you are done working on a branch go back to your original branch (normally master) and pull in changes from your modified branch. Once its working, you can optionally delete the branch if you dont think you are going to need it in the future.
<pre>
git checkout master
git merge [name of your new branch]
git branch -d [name of branch you want to delete]
</pre>

==Merging Changes Made in Other Branches==