On 03/08/16 14:25, David Woodhouse wrote: > On Tue, 2016-03-08 at 14:21 +0100, Laszlo Ersek wrote: >> As soon as Intel leadership signs off on a merge-oriented workflow, >> I'll seek to adopt it immediately. > > What is this "Intel leadership" of which you speak?
The Intel leadership I speak of are the people who organized the internal git trainings @ Intel, orchestrated the migration of individual developers to git, and ultimately okayed the move of the project to git. Edk2 as a project doesn't exactly look like irrelevant to Intel :), so I'm pretty sure management was involved in the transition. > I thought the > direction from Intel was that we would move to git (at last). 1. Yes, it was. 2. The management I speak of are the people who the direction was from. > Nobody made a statement that we should *NOT* use the git tools as they > were designed to be used, and should instead do things (rebasing) that > the git authors explicitly recommend *against*... did they? Using git is one thing, designing a workflow is another thing. Many workflows exist. Some of them are not exclusively merge based (QEMU, various subsystems of Linux), where sub-maintainers rebase and occasionally rework patches that they queue for their next pull request. Some other workflows are not merge based at all, regardless of what the git authors say. (This is a semi-frequent topic on reddit.com, for example.) Given that most of the edk2 developer community are coming from an SVN background, a linear history, at this stage of the git transition, was deemed more comprehensible. The initial git workflow was built around such a lineary history. Even this "lite" workflow has caused confusion and mistakes; the developer community's git expertise needs to mature. Please understand that I'm not personally defending the current workflow. I'm trying to relay (to the best of my understanding) how and why the current workflow was designed. I don't think it's fruitful if the two of us argue -- first, I'm not the one you have to convince, second, I don't need convincing at all. Laszlo _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
