2nd commit of August 28, 2013

Created local branch, made changes, not pushed into remote
3rd commit of Aug 28, 2013

Merge local branch into local master.
Made changes into local master to implement merge operatiopn onto local branch, where local master has not been pushed to remote
4th commit og Aug 28, 2013

Merge local master onto local branch, when updated local master is not on remote
Got local master changes into local branch
Concluding that merge works on local
4th commit followed by pushing updated local branch into remote
5th commit of Aug 28, 2013

Changes made in master to perform merge or pull
Merge local/remote branch into master using pull/merge
Using Pull remote branch to merge into master
6th commit of Aug 28, 2013

Pull remote branch to merge into master
Got merge conflicts, as the working directories were same
Resolved merge conflicts
Add and Commit master
And the changes are merged successfully
Push updated local master into remote