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.

▲

k4rli 5 hours ago | parent | next [-]

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.

	▲	theappsecguy an hour ago \| parent \| next [-]
		I would urge you to take a look at the founding team here, I doubt that they vibe coded this tool.
	▲	dare944 3 hours ago \| parent \| prev \| next [-]
		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.
	▲	weedhopper 4 hours ago \| parent \| prev [-]
		Rust! it’s written in rust and not javascript!!!!

▲

DonThomasitos 5 hours ago | parent | prev | next [-]

„Claude, merge these branches and resolve conflicts. Ask me if unclear.“

16M$ VC money saved.

▲

IshKebab 2 hours ago | parent | next [-]

I'm sure that will go well for my formal model in a language that about 100 people use...

	▲	_fizz_buzz_ an hour ago \| parent [-]
		If only 100 people in the world are using this language, who are you even merging code with, lol.

▲

user34283 5 hours ago | parent | prev [-]

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?

	▲	hrimfaxi an hour ago \| parent \| next [-]
		In my experience, yes. It has done a great job of choosing which changes should be integrated based on context in the repo, too.
	▲	speedgoose 3 hours ago \| parent \| prev [-]
		Not the person you responded too, but in my experience the answer is a big yes.

▲

hk__2 5 hours ago | parent | prev | next [-]

> 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

▲

a-french-anon 6 hours ago | parent | prev | next [-]

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).

▲

skydhash 2 hours ago | parent | prev [-]

> 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).