branch test
AND simple
& simple
conflict fixed
modified feaure1 again
merge conflict again
Another merge conflict test
another merge conflict test
Merge branch 'dev'
add merge - branch management
merge with no-ff
understanding git branch #01
Merge branch 'dev'
understanding git branch #02
understanding git branch #03
understanding git branch #03 - multi-branch merge
merge dev with no-ff
multi-branch merge conflict fixed #01
understanding git branch #03 - plus
multi-branch merge conflict fixed #02