3 ms·
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.
by IshKebab 7mo ago
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.
- a-french-anon 7mo agoWell, 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).
- k4rli 7mo agoWhat about a vibecoded replacement with emojis and javascript? Surely $trillion "ai" thing can generate a better solution than one Finnish guy 20 years ago.
- weedhopper 7mo agoRust! it’s written in rust and not javascript!!!!
- dare944 7mo agoLol. 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.
- theappsecguy 7mo agoI would urge you to take a look at the founding team here, I doubt that they vibe coded this tool.
- hk__2 7mo ago> 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 https://stackoverflow.com/a/24965574/735926
- DonThomasitos 7mo ago„Claude, merge these branches and resolve conflicts. Ask me if unclear.“ 16M$ VC money saved.
- user34283 7mo agoSo 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?
- speedgoose 7mo agoNot the person you responded too, but in my experience the answer is a big yes.
- hrimfaxi 7mo agoIn my experience, yes. It has done a great job of choosing which changes should be integrated based on context in the repo, too.
- IshKebab 7mo agoI'm sure that will go well for my formal model in a language that about 100 people use...
- _fizz_buzz_ 7mo agoIf only 100 people in the world are using this language, who are you even merging code with, lol.
- IshKebab 7mo agoSome of the other people?
- skydhash 7mo ago> 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).
- IshKebab 7mo ago> 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 https://github.com/mhagger/diff-slider-tools
- 1718627440 7mo ago> where Git's *default* merge algorithm gives you horrible diffs You are saying it yourself.
- IshKebab 7mo agoSaying 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.