new branch dev
feature1
edit
new master
resolve conflict
learn source tree
learn source tree
in the master add master file
add file name new
add second file
Merge branch 'dev'