Comment 1 for bug 436559

If I only modify files
so change
user@server:~/branch2$ echo 2 > 2.txt
user@server:~/branch2$ bzr add
to
user@server:~/branch2$ echo 2 > 1.txt
the final merge is successful.

In case of adding 2.txt merge from trunk you have to merge from trunk first
...
user@server:~/branch2$ bzr commit -m "2.txt"
user@server:~/branch2$ bzr merge
user@server:~/branch2$ bzr commit -m "Merged from trunk"