WildBit had a really cool project a while ago called Conveyor. [0] It’s a shame it never took off.
It was built on git, but hid the complexity of branching + other git things behind “tasks”. You’d start a task, and silently push that branch out to everyone. It’d silently merge things in the background and handle a lot of the chores you have to do with git rebasing and such to keep branches mergeable.
It failed miserably with us because it perpetually created impossible to solve git issues. Someone accidentally removes a gitignore file and commits a config file with a password? Your SOL. It will keep coming back because it will exist on at least one other person’s device which will get force pushed back to the repo.
The weird plumbing exists because version control is hard, and prone to humans throwing wrenches into its nominally perfect system.
The real reason you don’t remember every magic git incantation is because you normally only need a specific one, once a year. But it has to be there!
It was built on git, but hid the complexity of branching + other git things behind “tasks”. You’d start a task, and silently push that branch out to everyone. It’d silently merge things in the background and handle a lot of the chores you have to do with git rebasing and such to keep branches mergeable.
It failed miserably with us because it perpetually created impossible to solve git issues. Someone accidentally removes a gitignore file and commits a config file with a password? Your SOL. It will keep coming back because it will exist on at least one other person’s device which will get force pushed back to the repo.
The weird plumbing exists because version control is hard, and prone to humans throwing wrenches into its nominally perfect system.
The real reason you don’t remember every magic git incantation is because you normally only need a specific one, once a year. But it has to be there!
[0] https://web.archive.org/web/20190226201600/https://conveyor....