Please do this as team wise.
Links related to Git http://en.wikipedia.org/wiki/Git
The Git hosting software that you can install yourself http://gitorious.org/
Git reference http://gitref.org/
- Why Branching??
Branching makes the work more efficient as the branch you create doesnt exist
in the remote repo and you can test out new features and bug fixes without breaking whats already working.
- To create a branch all we need to do is go to the repo(working directory) and then type following command
git branch branchname
then by using the 'git checkout' command you can switch to your branch.
-Working on branches
* git branch (lists all local branches)
- Basic Merging :
After working on a branch on a particular issue if you wanna apply those changes to the main file then what you need to do is to checkout to that file using following command
and then you can run following command
- git merge 'branchname'
and then use commit command to finalise the changes.
- Merge Commands :
-Merging Conflicts :
Whenever same part of the file is changed in two different branches and if those are
merged then GIT wont be able to merge them cleanly. Then that confilct is to be resolved and then we must execute the above commands.