Can’t believe how this whole AI movement seems to want to reinvent software engineering, poorly.
Which should be basic skill on anyone dealing with code, but Git is not just programmer's tool any more for a long time so better UI is welcome
git worktree add -b feature-2 ../feature-2for example: It allows me to test coworkers branches with mine without merging or creating new branch.
It has many features that makes it super easy to add patch to any commit in any branch
- One local copy of a repo with multiple work trees checked out at once, on different branches/commits? Git does that.
- "Add a patch to any commit in any branch" I can't think of a way of interpreting this statement (and I can think of a couple!) that isn't something git can do directly.
Maybe it adds some new UI to these, but those are just git features. Doesn't mean it's a bad product (I have no idea, and "just UI" can be a good product) but these seem to be built-in git features, not Gitbutler features.
How is that not supported by worktrees? You are aware, that you can checkout commits?
Surely $trillion "ai" thing can generate a better solution than one Finnish guy 20 years ago.
You can define your own merge strategy that uses a custom executable to fix conflicts.
16M$ VC money saved.
Does it work well for resolving merge conflicts in your experience?
It seems like everyone that hold this opinion want Git to be some magical tool that will guess their intent and automatically resolve the conflict. The only solutions other than surfacing the conflict are locking (transactions) or using some consensus algorithm (maybe powered by logical clocks). The first sucks and no one has been able to design the second (code is an end result, not the process of solving a problem).
Absolutely not. There are plenty of fairly trivial solutions where Git's default merge algorithm gives you horrible diffs. Even for cases as simple as adding a function to a file it will get confused and put closing brackets in different parts of the diff. Nobody is asking for perfection but if you think it can't be improved you lack imagination.
There are a number of projects to improve this like Mergiraf. Someone looked at fixing the "sliders" problem 10 years ago but sadly it didn't seem to go anywhere, probably because there are too many core Git developers who have the same attitude as you.
You are saying it yourself.
I doubt you would defend any of Windows' poor defaults because there are tools to fix them.
They'll start injecting ads in your commit messages, forcing you to subscribe to a premium plan.
1) Git is fine
2) I would not want to replace critical open source tooling with something backed by investor capital from its inception.
Sure, it will be “open source “, but with people throwing money behind it, there’s a plan to extract value from the user base from day one.
I’m tired of being “the product”.
Critical open source tooltips by should spring from the community, not from corporate sponsorship.