3 ms·
Rebasing and similar operations are only a hassle because multiple authors can edit the same files, so you end up with conflicts. In the scenario where every a
by capableweb 3y ago
Rebasing and similar operations are only a hassle because multiple authors can edit the same files, so you end up with conflicts.
In the scenario where every authors can only change their own files, you can avoid those sort of conflicts, as they'll never happen.
Remaining is how to solve files referencing other files (in the case of a federated social media, posts that are replies to other posts) which are way easier to solve, as it's not really conflicts but invariants that have to be created.
- codetrotter 3y ago> every authors can only change their own files, you can avoid those sort of conflicts, as they'll never happen A single author can still run into these issues with git if they use multiple devices. Can the same happen in this social media network for a user that uses the same account on their phone, their tablet and their computers?
- capableweb 3y ago> A single author can still run into these issues with git if they use multiple devices. No, using multiple devices are fine, as long as you're not editing the same content in two different ways on them. Meaning changing "A B" to "A C" on one device, and to "A D" on the other. > Can the same happen in this social media network for a user that uses the same account on their phone, their tablet and their computers? When using AT protocol, you'd still be connected to the same PDS, so no conflicts. The conflicts mentioned earlier are about server<>server federation, not server<>client communication.