added inheritance branch to the script
Merge branch 'm1.jdbc' into m1.springjdbc.ch1
Merge branch 'm1.springjdbc.ch1' into m1.springjdbc.ch2
Merge branch 'm1.springjdbc.ch2' into m1.mybatis
Merge branch 'm1.mybatis' into m2.entitylifecycle
Merge branch 'm2.entitylifecycle' into m2.ids
Merge branch 'm2.ids' into m3.associations.components
Merge branch 'm3.associations.components' into m3.associations.oto
Merge branch 'm3.associations.oto' into m3.associations.collections
Merge branch 'm3.associations.collections' into m4.fetching
Merge branch 'm4.fetching' into m4.bulk
annotations for bulk
merge script