From 8de8574d5e440dd5e14b8a93a4d3fda8be045920 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 1 Mar 2019 16:55:24 -0400 Subject: [PATCH] devblog --- doc/devblog/day_576__import_tree_details.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/devblog/day_576__import_tree_details.mdwn diff --git a/doc/devblog/day_576__import_tree_details.mdwn b/doc/devblog/day_576__import_tree_details.mdwn new file mode 100644 index 0000000000..0e0b83f01e --- /dev/null +++ b/doc/devblog/day_576__import_tree_details.mdwn @@ -0,0 +1,11 @@ +Still working on [[todo/import_tree]] today. I decided to +make the imported commit be on an unrelated history from the main branch, +which avoids some very susprising merge behavior, but means +users will need to pass --allow-unrelated-histories to git merge. + +Also got `export` and `sync` commands updating the remote tracking branch. +It was surprisingly complicated to do. + +With that done, I've tested exporting to a directory remote, +then making changes to the directory manually, and importing, and it all +works together.