Git Repository Setup

##Repository Set-up##

Once you clone your fork of the repository onto your computer, you may need to get updates from the other forks and the main repository. To add them, open a terminal and enter the following:

###SSH (recommended)###

git remote add source git@github.com:CMPUT301F13T03/adventure.datetime.git
git remote add andrew git@github.com:afontaine/adventure.datetime.git
git remote add evan git@github.com:edegraff/adventure.datetime.git
git remote add jesse git@github.com:jesseDtucker/adventure.datetime.git
git remote add james git@github.com:Jtfinlay/adventure.datetime.git
git remote add jacob git@github.com:jviau/adventure.datetime.git

###HTTPS###

git remote add source https://github.com/CMPUT301F13T03/adventure.datetime.git
git remote add andrew https://github.com/afontaine/adventure.datetime.git
git remote add evan https://github.com/edegraff/adventure.datetime.git
git remote add jesse https://github.com/jesseDtucker/adventure.datetime.git
git remote add james https://github.com/Jtfinlay/adventure.datetime.git
git remote add jacob https://github.com/jviau/adventure.datetime.git

To pull in new changes now, we just have to git fetch $NAME and git merge $NAME/$BRANCH

I won't make you use multiple branches, but it is recommended. You can obviously leave out adding your own name if you want, but there won't be any conflicts.

##Global Gitignore##

Everyone should have a global gitignore file on their system that contains ignore rules for their OS and IDE of choice. To set the file: git config --global core.excludesfile $FILE (I set $FILE to ~\.gitignore)

Once set, create the file in your editor of choice and add the following.

• Windows
• Linux
• Eclipse
• Intellij

###Windows###

# Created by http://gitignore.io

### Windows ###
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

###Linux###

# Created by http://gitignore.io

### Linux ###
.*
!.gitignore
!.git*
*~

###Eclipse###

# Created by http://gitignore.io

### Eclipse ###
*.pydevproject
.project
.metadata
bin/**
tmp/**
tmp/**/*
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath

###Intellij###

# Created by http://gitignore.io

### IntelliJ ###
*.iml
*.ipr
*.iws
.idea/