There is manual merging code in git-bug [0] only because git doesn't provide a low-level command to rebase a branch onto another without touching the index. I d

There is manual merging code in git-bug [0] only because git doesn't provide a low-level command to rebase a branch onto another without touching the index. I don't think it's an intended limitation of git but more likely no one had a use case for that so they simply used the normal index. Apart from that, a normal git rebase would merge two versions of the same bug conflict free. Each commit is independent from the other. A merge is simply moving the new operations at the end of the chain of edit. If for instance, that means that you closed a bug that is already closed, well the bug is still closed and your action will still be displayed in the timeline. [0]: https://github.com/MichaelMure/git-bug/blob/c974cc022d3ecd2e7567e66bdce504fe8c51e922/bug/bug.go#L452-L540 https://github.com/MichaelMure/git-bug/blob/c974cc022d3ecd2e...