[13:30] is there a "lazy resolve conflicts" command? for some really weird reason everything is conflicted and I just want to "revert all conflicted files" [15:08] What do you mean "lazy"? [15:58] I ended up just using sed on bzr status and doing it that way [15:59] took a lot longer than it could have but it worked