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.