| > rebase is already a big no-no in any sort of distributed development You are ill-informed on this subject, and I have a proof-by-existence. Sun Microsystems, Inc., used a rebase workflow from the mid-90s all the way until the end, at least for the codebases that made up Solaris (OS/Net and other consolidations), and it did so while using a VCS that did not support rebase out of the box (Teamware, over NFS). It was essentially a git rebase workflow years before Larry McVoy created BitKeeper, and even more years before Git was created, and even more years before the rebase vs. merge workflow controversies. When I was at Sun we had ~2,000 developers on mainline Solaris. The rebase workflow worked fantastically well. Large projects had their own repositories that were rebased periodically, and team members would base their clones on the project's clone (known as a "gate"). Large projects' gates would get archived for archeological interest. All history upstream was linear. No. Merge. Commits. (We called them "merge turds", and they were a big no-no.) Solaris development was undeniably distributed development. |