Committing from a local branch to remote
Merge branch 'master' of https://github.com/manoj2589/MEAN_Nov_2014_Test into myFirstBranch
Merge branch 'master' into myFirstBranch
Commit on fileOne: Initializing Conflicts
Committing fileOne in another branch so it would conflict
Fixed Merge conflicts manually...
Merge branch 'master' of https://github.com/manoj2589/MEAN_Nov_2014_Test