Git is fine. I would like something better than fine though, especially for dealing with rebase/merge conflicts where I would say Git is mediocre.
Git is fine. I would like something better than fine though, especially for dealing with rebase/merge conflicts where I would say Git is mediocre.
What about a vibecoded replacement with emojis and javascript?
Surely $trillion "ai" thing can generate a better solution than one Finnish guy 20 years ago.
I would urge you to take a look at the founding team here, I doubt that they vibe coded this tool.
Rust! it’s written in rust and not javascript!!!!
Lol. Unfortunately VCs and ever-so-ernest founders are impervious to irony. Best to just let them get their grift on and just be happy it isn't your money they're boondoggling.
> Git is fine. I would like something better than fine though, especially for dealing with rebase/merge conflicts where I would say Git is mediocre.
You can define your own merge strategy that uses a custom executable to fix conflicts.
https://stackoverflow.com/a/24965574/735926
„Claude, merge these branches and resolve conflicts. Ask me if unclear.“
16M$ VC money saved.
I'm sure that will go well for my formal model in a language that about 100 people use...
If only 100 people in the world are using this language, who are you even merging code with, lol.
Some of the other people?
So far I have not let AI work with git, because I preferred handling version control myself.
Does it work well for resolving merge conflicts in your experience?
In my experience, yes. It has done a great job of choosing which changes should be integrated based on context in the repo, too.
Not the person you responded too, but in my experience the answer is a big yes.
Well, yeah, but Git is basically UNIX/POSIX or JPEG. Good enough to always win against better like Plan 9 or JPEG XL (though I think this one may win in the long term).
> especially for dealing with rebase/merge conflicts where I would say Git is mediocre.
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).
> 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.
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.
https://github.com/mhagger/diff-slider-tools
> where Git's *default* merge algorithm gives you horrible diffs
You are saying it yourself.
Saying what? Defaults matter. The fact that other people are doing their best to improve Git's mediocre defaults doesn't excuse it.
I doubt you would defend any of Windows' poor defaults because there are tools to fix them.