feature-1 22:11
master 22:12
Merge branch 'feature-1'
feature2 start
feature2 halad
nulla
master megy
feature2 start
feature2 halad
master halad...
master 21:11
feature valami
master halad
conflict resolved
feature-1 start
feature-1 end
master halad
Merge branch 'feature-1'
feature 2 start
feature 2 end