new | show | ask | jobs Github

mrkeen 11 hours ago

Git is designed for a distributed situation. Different coders spread across time and space.

You always have the ability to try out the simple version that ignores that reality:

* Don't branch

* Always force-push to master.

▲

maccard 11 hours ago | parent [-]

Neither of those work if you work with one other person.

▲

svnt 7 hours ago | parent [-]

They work as well as perforce.

▲

maccard 6 hours ago | parent | next [-]

I disagree. Perforce requires you to be connected to the depot (ignoring reconcile offline work because that’s a break glass feature), and allows you to check in when you are not synced to latest. It forces you to deal with file level conflicts at time of update, not at the time of submission, and the intermediate state of “I have local changes that the remote/server doesn’t know about” is considered exceptional rather than the norm.

I can count on one hand the number of times I’ve had to reconcile offline work in the last 18 months, which is the equivalent of every merge commit in git.

	▲	jayd16 3 hours ago \| parent \| next [-]
		Reconcile is far heavier of an operation than a scan. You can use Git LFS locking or other side channel things to get file status tracking to work in Git but its a slog. You can usually find something for your engine of choice though.
	▲	3 hours ago \| parent \| prev [-]
		[deleted]

▲

jayd16 3 hours ago | parent | prev [-]

P4 has file locking and automatic file type locking on checkout to prevent conflicts. It honestly goes a LONG way and the games industry is built around that tooling.