here i am learning git branch now
this is commit to branch learngit2
change again in branch learngit2
I just learnt how to merge branches and resolve conflicts
first change after adding learngit2 again
change in learngit after first merge
change in learngit2
merge after mark conflict resolved
merge learngit branch
merge learngit2
commit fileaddin_learngit in master branch
commit fileaddin_learngit2 in branch learngit2
Merge branches 'master' and 'learngit2' into learngit