11 ms·

Shameless plug: if you like this, I'm looking for a remote job. My email is on my Github profile and my resume is here: http://pellelatarte.fr/dl/resume.pdf htt

Shameless plug: if you like this, I'm looking for a remote job. My email is on my Github profile and my resume is here: http://pellelatarte.fr/dl/resume.pdf http://pellelatarte.fr/dl/resume.pdf .

notduncansmith 8y ago
Sorry for turning this comment thread into an AMA but I have a question for you as the author :) Reading over this page https://github.com/MichaelMure/git-bug/blob/master/doc/model.md https://github.com/MichaelMure/git-bug/blob/master/doc/model... gives me the impression that you’re reproducing some of Git’s functionality. Can you elaborate on why Git’s merge model is insufficient and why the “Operation/OperationPack” serves the distributed-edits problem better than Git itself? Or alternatively, explain what I’m missing about how this doesn’t step on Git’s toes? Congrats on building this and shipping it!
- michaelmure 8y ago
  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...
- michaelmure 8y ago
  Damn, your comment moved my shameless plug at the very end of the thread :(
  - loco5niner 8y ago
    I wouldn't be too worried, it made it here: https://news.ycombinator.com/bestcomments https://news.ycombinator.com/bestcomments

Shameless plug: if you like this, I'm looking for a remote job. My email is on my Github profile and my resume is here: http://pellelatarte.fr/dl/resume.pdf http://pellelatarte.fr/dl/resume.pdf .

notduncansmith 8y ago

Sorry for turning this comment thread into an AMA but I have a question for you as the author :) Reading over this page https://github.com/MichaelMure/git-bug/blob/master/doc/model.md https://github.com/MichaelMure/git-bug/blob/master/doc/model... gives me the impression that you’re reproducing some of Git’s functionality. Can you elaborate on why Git’s merge model is insufficient and why the “Operation/OperationPack” serves the distributed-edits problem better than Git itself? Or alternatively, explain what I’m missing about how this doesn’t step on Git’s toes? Congrats on building this and shipping it!

michaelmure 8y ago
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...
michaelmure 8y ago
Damn, your comment moved my shameless plug at the very end of the thread :(
- loco5niner 8y ago
  I wouldn't be too worried, it made it here: https://news.ycombinator.com/bestcomments https://news.ycombinator.com/bestcomments