diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-31 19:06:30 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-31 19:06:30 -0400 |
| commit | be030d78ba09989f89313ce6c5733fe76f9c591c (patch) | |
| tree | 93d6fb0b5342fdcbb2dede7d9274f7ffc1b82ddb /doc | |
| parent | 7cd0ba73996b2ed092f8ee7cb62d0edf9f8f3f1b (diff) | |
devblog
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/devblog/day_376__in_the_weeds.mdwn | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/doc/devblog/day_376__in_the_weeds.mdwn b/doc/devblog/day_376__in_the_weeds.mdwn new file mode 100644 index 000000000..4454d7672 --- /dev/null +++ b/doc/devblog/day_376__in_the_weeds.mdwn @@ -0,0 +1,18 @@ +Spent all day fixing sync in adjusted branches. I was lost in the weeds for +a long time. Eventually, drawing this diagram helped me find my way +to a solution: + + origin/master adjusted/master master + A A + |--------------->A' | + | | | + | C'- - - - - - - - > C + B | + | | + |--------------->M'<-----------------| + +After implementing that, syncing in adjusted branches seems to work much +better now. And I've finally merged support for them into master. + +There's still several bugs and race conditions and upgrade things to sort +out around adjusted branches. Proably another week's work all told. |