Code review comment for lp:~craighewetson-deactivatedaccount/bzr/update_with_local_commit

I think that conflict is spurious - we shouldn't be creating it in the
first place.

*if* the update after the commit works, then the update before the
commit should work identically.

-Rob