add function1
do something
do something2
do something3
Merge branch 'feature/myfeature' into develop
do something3,4
fix conflict
init function2
modify function2
Merge branch 'feature/add_function2' into develop
Merge branch 'release/1.2'