added feature
style changes
Merge branch 'development'
work on new feature
new feature still unfinished
bug fix for critical issue #1234
Merge branch 'hotfix-v1.0'
finished new feature
Merge branch 'development'