develop first file
new a test file: 'conflict.test'
develop modify file: 'conflict.test'
add a newline
develop: add a newline
resolve conflict
repeat commit file: 'hello_world.c'