branch with conflicts is merged
file added
new file added
Removed first-r.php
Renaming first.php
Added tag first-tag for changeset c1dcd7fcab2d
First demonstration of tag
Merge was successful