poo4_project

IG2I Project in JAVA EE

##Proxy is a sh*t

To work with git at IG2I do this :

1. Set up the proxy

git config --global http.proxy http://username:[email protected]:3128

Replace username and pwd

2. Check your config

git config --global --get http.proxy

3. If you want to unset the proxy config

git config --global --unset http.proxy

##Clone this repo

git clone https://github.com/pachr/poo4_project.git (with no SSH keys)
git clone [email protected]:pachr/poo4_project.git (If you have a public Key)

##Create a branch

FROM MASTER BRANCH ONLY

Check your local branch

$> git checkout master
$> git pull origin master
$> git checkout -b <branch_name>

##Commit your updates

$> git add <file_name>
$> git diff --staged (To check your updates with the last commit)
$> git commit -m "<message>"

##Push a branch to the remote repository

$> git push origin <branch_name>

##Create a pull request to merge on develop

1. With a command line

ON YOUR BRANCH

$> hub pull-request -b develop

Hub documentation

2. With github GUI

Click here to see all the pull requests

• Click on "New Pull Request Button"
• Select develop branch for the base branch
• Select your branch in compare
• Create the pull request
• Tag @TimDzik in the description or in comments

##Contributors:

• Lucien Fregosi
• Paul-Alexandre Chretien
• Mohammed Belkheiri
• Timothee Dzik