diff options
author | 2016-04-06 19:26:25 -0400 | |
---|---|---|
committer | 2016-04-06 19:26:25 -0400 | |
commit | 00837de88ca9d892ac4608aeca37fa3a036ed5c4 (patch) | |
tree | 25a85cf40030b3a75601d9bad5b73ca523e200d4 | |
parent | 308a2c631c9b3b629fe2f2827ee42509248636fb (diff) |
devbog
-rw-r--r-- | doc/devblog/day_378__finishing_adjusted_branches_merge.mdwn | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/doc/devblog/day_378__finishing_adjusted_branches_merge.mdwn b/doc/devblog/day_378__finishing_adjusted_branches_merge.mdwn new file mode 100644 index 000000000..aa0cd1f8d --- /dev/null +++ b/doc/devblog/day_378__finishing_adjusted_branches_merge.mdwn @@ -0,0 +1,23 @@ +Well, I had to rethink how merges into adjusted branches should be handled. +The old method often led to unnecessary merge conflicts. My new approach +should always avoid unncessary merge conflicts, but it's quite a trick. + +To merge origin/master into adjusted/master, it first merges origin/master +into master. But, since adjusted/master is checked out, it has to do the +merge in a temporary work tree. Luckily this can be done fairly +inexpensively. To handle merge conflicts at this stage, git-annex's +automatic merge conflict resolver is used. This approach wouldn't be +feasible without a way to automatically resolve merge conflicts, because +the user can't help with conflict resolution when the merge is not +happening in their working tree. + +Once that out-of-tree merge is done, the result is adjusted, and merged +into the adjusted branch. Since we know the adjusted branch is a child of +the old master branch, this merge can be forced to always be a +fast-forward. This second merge will only ever have conflicts if the work +tree has something uncommitted in it that causes a merge conflict. + +Wow! That's super tricky, but it seems to work well. While I ended up +throwing away everything I did [[last Thursday|day_376__in_the_weeds]] +due to this new approach, the code is in some ways simpler than that +old, busted approach. |