-
I just watched Scott Chacon's FOSDEM 2024 talk on Git Tips and Tricks and was wondering: how exactly does gitbutler support multiple open branches on the same repo? |
Beta Was this translation helpful? Give feedback.
Replies: 1 comment
-
I'll try to do a longer blog post on the internals of this (been working on one for a while now), but the general idea is:
As far as where the code is, it's all over the place, but a lot of the logic is in the |
Beta Was this translation helpful? Give feedback.
I'll try to do a longer blog post on the internals of this (been working on one for a while now), but the general idea is:
git diff
between your working directory and your "base branch" (so, something likeorigin/master
)git diff
, if the hunks have changed, we try to keep ownership where it was before as much as possible. New hunks we havent seen before go into a default branch (you select in the UI)