Math4Team/RIT/Tips & Tricks - Revision history

Jlew at 22:05, 7 March 2010

2010-03-07T22:05:45Z

← Older revision		Revision as of 18:05, 7 March 2010
Line 20:		Line 20:
	* Do another commit (not sure if this is required)		* Do another commit (not sure if this is required)
	* Now finally push and hopefully it will work		* Now finally push and hopefully it will work

			===Git and Activity Workflow===
			Here is a little guide one a possible workflow: [[User:Jlew/XO_Workflow]]

Dpk3062: Added Git Issues section

2009-09-10T00:03:17Z

Added Git Issues section

← Older revision		Revision as of 20:03, 9 September 2009
Line 8:		Line 8:
	==Toolbar listener==		==Toolbar listener==
	We found out that by default, the tabs in the top of the game only change the part above the toolbar and not the main part of the game below which we planned to modify a bit. However, we found an application called Measure which does what we want to do. There is some code which we can copy from to make changes to the main part of the screen when you change tabs. Go to the [http://dev.laptop.org/git/projects/measure/tree/ source code for Measure] and open [http://dev.laptop.org/git/projects/measure/tree/toolbar_top.py toolbar_top.py]. The function we are interested in is called "def _toolbar_changed_cb(self, tbox, num)".		We found out that by default, the tabs in the top of the game only change the part above the toolbar and not the main part of the game below which we planned to modify a bit. However, we found an application called Measure which does what we want to do. There is some code which we can copy from to make changes to the main part of the screen when you change tabs. Go to the [http://dev.laptop.org/git/projects/measure/tree/ source code for Measure] and open [http://dev.laptop.org/git/projects/measure/tree/toolbar_top.py toolbar_top.py]. The function we are interested in is called "def _toolbar_changed_cb(self, tbox, num)".

			==Git Issues==
			===Pushing Problems===
			If you are attempting to push and are getting an error messaging containing ''master -> master (non-fast forward)'' when you have already successfully pushed in the past and force pushing isn't working, you can try and follow these steps (this worked for me, but I'm not an expert at Git so I can't say how well it will work for you):
			* Backup your project files (in case something goes wrong)
			* Do a pull (will complain about some conflicting files)
			* Reset the head: ''git reset --hard HEAD''
			* Remove the conflicting files: ''git rm -r <files>''
			* Commit the changes
			* Do another pull (not sure if this is required)
			* Do another commit (not sure if this is required)
			* Now finally push and hopefully it will work

FGrose: moved Tips & Tricks to Math4Team/RIT/Tips & Tricks

2009-08-31T23:21:29Z

moved Tips & Tricks to Math4Team/RIT/Tips & Tricks

← Older revision	Revision as of 19:21, 31 August 2009
(No difference)

Dbj4366 at 00:50, 25 April 2009

2009-04-25T00:50:49Z

← Older revision		Revision as of 20:50, 24 April 2009
Line 5:		Line 5:
	* /home/olpc/Activities/Assimilate.activity		* /home/olpc/Activities/Assimilate.activity
	If you haven't figured this out yet, you may be in trouble... ;-)		If you haven't figured this out yet, you may be in trouble... ;-)

			==Toolbar listener==
			We found out that by default, the tabs in the top of the game only change the part above the toolbar and not the main part of the game below which we planned to modify a bit. However, we found an application called Measure which does what we want to do. There is some code which we can copy from to make changes to the main part of the screen when you change tabs. Go to the [http://dev.laptop.org/git/projects/measure/tree/ source code for Measure] and open [http://dev.laptop.org/git/projects/measure/tree/toolbar_top.py toolbar_top.py]. The function we are interested in is called "def _toolbar_changed_cb(self, tbox, num)".

Dbj4366: New page: ==Description== The purpose of this page is to collaborate with each other and share useful information which we can all benefit from. ==Directory of source code on the XO== * /home/olpc/...

2009-04-25T00:37:30Z

New page: ==Description== The purpose of this page is to collaborate with each other and share useful information which we can all benefit from. ==Directory of source code on the XO== * /home/olpc/...

New page

==Description==
The purpose of this page is to collaborate with each other and share useful information which we can all benefit from.

==Directory of source code on the XO==
* /home/olpc/Activities/Assimilate.activity
If you haven't figured this out yet, you may be in trouble... ;-)