From f4308b107242781b5de98804eb68a9657b348c49 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jun 2014 20:14:52 -0400 Subject: devblog --- doc/devblog/day_181__tricky_merge.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/devblog/day_181__tricky_merge.mdwn (limited to 'doc') diff --git a/doc/devblog/day_181__tricky_merge.mdwn b/doc/devblog/day_181__tricky_merge.mdwn new file mode 100644 index 000000000..c6bcaf8d4 --- /dev/null +++ b/doc/devblog/day_181__tricky_merge.mdwn @@ -0,0 +1,8 @@ +Spent most of today improving behavior when a sync or merge is +interrupted in direct mode. It was possible for an interrupt at the wrong +time to leave the merge committed, but the work tree not yet updated. And +then the next sync would make a commit that reverted the merged changes! + +To fix this I had to avoid making any merge commit or indeed updating the +index until after the work tree is updated. It looked intractable for a +while; I'm still surprised I eventually succeeded. -- cgit v1.2.3