Capstone Project

GitGUI and SourceTree Tutorials created by Cornelius Donley

Setting up project using Git GUI

Git GUI

Press the Windows key
Type in 'git'
Select 'Git GUI'
Choose Create New Repository
Select a folder where you want to store the application

example: F:\Capstone\Alumbook

On the menu bar click Edit -> Options type in your full name and email then click Save
In the menu bar select Repository -> Create Desktop Icon, save it in the parent directory

example: F:\Capstone\

Double clicking that icon will now open the gui loaded with the project

Setting up remotes

On the menu bar click Remote -> Add...
Under name type in 'upstream'
Under location type in 'https://github.com/NCC-Capstone-2015/The-Alumbook.git'
Click Add

In the menu bar click Remote -> Add...
Under name type in 'origin'
Under location type paste the https link from your own forked repository on GitHub
Click Add

On the menu bar click Tools -> Add...
Under name type 'Pull upstream'
Under command type 'git pull upstream master'

On the menu bar click Tools -> Add...
Under name type 'Pull origin'
Under command type 'git pull origin master'

Under Tools click Pull origin
Under Tools click Pull upstream

Commit and Push

First click Rescan to get all the changes To commit changes, click Stage Changes, enter a commit message, then click Commit
To push comitted changes, click Push, make sure origin is selected under Destination Repository, then click Push
Enter your GitHub username and password

Setting up project using SourceTree

Git Client

Go to https://github.com/NCC-Capstone-2015/The-Alumbook
On the far right, click Fork and fork to personal GitHub account
Go to https://www.sourcetreeapp.com/ to download and install SourceTree
Run SourceTree
Login with your GitHub account
In the list of repositories, select The-Alumbook where you are listed as owner
Choose a destination path and click Clone
In the top right corner click Settings, then Add
Make sure Default remote is NOT checked
Enter upstream for the Remote name field
Enter https://github.com/NCC-Capstone-2015/The-Alumbook.git in the URL / Path field
Click OK

Using Pull

Click the Pull button on the top of the SourceTree application
Select NCC-Capstone-2015 in the Pull from remote dropdown
Select master from the Remote branch to pull dropdown
Click OK

Commit Changes

Click the Commit button on the top of the SourceTree application
Select the files to commit
Enter comments of changes in the bottom text box
Optional: Under Commit Options in the bottom right, you can select Create Pull Request instead of using GitHub.com
Click Commit in the bottom right

Using Push

Click the Push button on the top of the SourceTree application
Click OK

Creating Pull Request via Browser

Go to GitHub.com
Select your The-Alumbook repository
Click the green button on the left side of the page
Click the green Create Pull Request button

Changing mysql password

*** if your username is different from root run this command***
RENAME USER 'root'@'localhost' TO 'root'@'localhost'; use the manger in the rubystack file
click on phpmyadmin
click on the console on the bottom
run this command
SET PASSWORD FOR root@localhost = PASSWORD('password'); this will change whatever your password was previously to password