Git / Github cheat sheet

Typical development process process:

	git checkout master (switch to the master branch)
	git pull (get the latest master branch)
	git checkout -b [branch name] (create and check out a new branch)
	git push --set-upstream origin [branch name] (publish the branch to github)
	git add -A (stage all of the files to be committed)
	git commit -m "Some checkin comment" (commit the changes to my local dev branch)
	git checkout master (switch to the master branch)
	git pull (get the latest master branch)
	git checkout [branch name] (switch back to the development branch)
	git merge master -m "Some comment" (merge the master code into the development branch)
	git status (make sure all of the files look good, should only see my changes)
	git commit -m 'merge from master' (commit the merge result to my local dev branch)
	git push origin (push my local dev branch to the server)
	git status (make sure everything made its way up)
	Go to github and create a pull request

To clone the ringtail branch fresh:

• git clone https://github.com/fti-technology/ringtail.git

To get an older version of the source code

• git fetch --tags (to get the latest list of all tags)
• git tag -l (to see the list of tags)
• git checkout [tag name] (ex. git checkout v9.4.004) (this sets my environment to that version of ringtail)

To check into an RC branch

• Follow the steps under "To get an older version of the source code"
• git checkout [tag name] -b p[bug number] (this creates a branch against the rc code that i can check in against)
• Login to github and go to my pull request
• Select Base: release in the dropdown if this is against the latest release. otherwise you have to find the branch for the previous release you are checking in against (not sure how to do that).

To run webpack

1. Open powershell
2. Navigate to the UIStatic directory
3. Run this command ./build.ps1 -w -t
1. -w says watch for changes in the code files
2. -t says watch for changes with the uistatic test files