devblog
This commit is contained in:
parent
84c9c93d58
commit
8de8574d5e
1 changed files with 11 additions and 0 deletions
11
doc/devblog/day_576__import_tree_details.mdwn
Normal file
11
doc/devblog/day_576__import_tree_details.mdwn
Normal file
|
@ -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.
|
Loading…
Add table
Add a link
Reference in a new issue