On Sun, Sep 14, 2014 at 11:11 AM, hasufell <hasuf...@gentoo.org> wrote: > > The only hard part is that people have to know the differences between > merging/rebasing, fast-forward merges, non-fast-forward merges etc. and > when and when not to do them. > > 'git rebase' is a powerful thing, but also pretty good to mess up your > local history if used wrong. > > I think we can write up a gentoo-specific guide in 2-3 weeks. >
Sounds good. I think one thing we need to get over with the whole git migration is the fact that it isn't going to be perfect. We probably will find minor errors in the migration itself, little glitches in the back-end stuff, problems in the proposed workflow, and so on. We're just going to have to adapt. We've been using cvs for eons and have learned to ignore its shortcomings and have well-polished workflows. It isn't like there are 500 devs doing commits every day. We're a reasonably tight community and we're just going to have to work together to get over the inevitable bumps. It may make sense to just start out with guidelines in the beginning, and then we can turn them into rules when problems actually come up. Once upon a time there wasn't a hard rule about changelog entries for removals/etc, and the world didn't end, but we decided that having the rule made more sense than not having it. With git we should expect more of the same - we won't get it 100% right out of the gate. -- Rich
