Editing Atlases (Sprite Collections)

[Michael Christensen-Calvin]

Hey everyone,

   For anyone that might be editing the atlases: due to the amount of merge conflicts we get I am going to decree that no one but me edits the atlases (or if I tell you that you can do it). If you need to add something in, send me the images and which atlas (sprite collection) you want it in and I will add that to the atlas and push it in a commit to master. You then stash your other changes, pull from master, and pop your changes back onto your working copy (can be easily done through sourcetree, there is a big stash button)

If I tell you that you can edit the atlas, then you shoudl do the same procedure, stash your other chagnes. Update the atlas and push that to master, then pop your changes again. Any atlas changes should be pushed directly to master as soon as they are made so that everyone will be up to date.


On another note, if you are working on anything, please keep that code on the remote. At the end of your session push your code. If it breaks the game or is not ready enough to be put in master, then create a remote branch and push to that.

And lastly, at the start of your sessions, always pull from master (this can be done via command line with:

"git pull --rebase origin master"

or from source tree by checking out master, doing a pull to update it, then right clicking on your branch and selecting "Rebase current changes onto <branch_name>".

This will make the git merging process much easier if we have any merging issues at all.

Thank you,

 -- Michael C

--

Michael Christensen-Calvin
Stanford Class of 2013 -- Computer Science (Human Computer Interaction)

Stanford Low Battery Gaming Society - President & Tech Wizard