> Difficult to review right now as mir_connection.cpp changes are conflicting > with those in https://code.launchpad.net/~kdub/mir/fix-1577967/+merge/294283.
The mir_connection.cpp changes here are not needed with that branch. So you can try:
$ bzr resolve --take-this src/client/mir_connection.cpp
« Back to merge proposal
> Difficult to review right now as mir_connection.cpp changes are conflicting /code.launchpad .net/~kdub/ mir/fix- 1577967/ +merge/ 294283.
> with those in https:/
The mir_connection.cpp changes here are not needed with that branch. So you can try:
$ bzr resolve --take-this src/client/ mir_connection. cpp