4 ms·
"A DVCS that rely on a central server for merging (sandcastle) is no longer.. distributed... (and you cannot have distributed team work here, this is wrong in m
by DannyBee 12y ago
"A DVCS that rely on a central server for merging (sandcastle) is no longer.. distributed... (and you cannot have distributed team work here, this is wrong in multiple way)"
Yet doing things like rebasing or merging pull requests properly, requires you have an up-to-date master, making it a centralized operation.
People seem quite happy with this.
- hueving 12y ago>Yet doing things like rebasing or merging pull requests properly Rebasing is a smell of bad source code management. Merging pull requests is fine whether or not you are up to date. I don't know what you mean by 'properly'.
- indygreg2 12y agoIt is much easier to bisect linear history than history with merges.
- hueving 12y agoHow is it any different? I do it all of the time with no problems.
- Cakez0r 12y agoWhy do you think rebasing is a bad code smell? Most devs where I work don't rebase and our source tree ends up looking like this https://i.imgur.com/r0QCw7F.png https://i.imgur.com/r0QCw7F.png
- DannyBee 12y agoI don't know what you think happens if you merge against not tip of tree, and then try to commit against tip of tree - hint: It has to merge against tip of tree again if it wants to get back to a single head.