|
| From: | Bastien |
| Subject: | Re: bzr commit raises a weird conflict |
| Date: | Tue, 09 Apr 2013 11:37:26 +0200 |
| User-agent: | Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) |
Hi Christopher, Christopher Schmidt <address@hidden> writes: > bzr resolve --take-other > > solved it for me. It did for me as well, thanks for the trick. I've pushed the fix. -- Bastien
| [Prev in Thread] | Current Thread | [Next in Thread] |