branch2 add two line
merge branch2
branch1 add another line
merge branch1 2
branch1 modify a line
Merge branch 'branch1'
branch1 modify first line
branch2 modify first line
Merge branch 'branch1'
merge confilct
branch1 3
branch2 3
merge branch1 3
Merge branch 'branch2'
add js file
add ListModel a line
add a s
add a s
branch2 add local data
branch1 add an s