wrote an a file
update a.txt
add b.txt
rename a.rtf
branch update a.rtf
update
dd
conflict fixed
1
2
pull