On Wed, Apr 30, 2014 at 1:15 PM, Geert Bosch <boschg@xxxxxxx> wrote: > > On Apr 28, 2014, at 02:29, Marat Radchenko <marat@xxxxxxxxxxxxxxxx> wrote: > >> In short: >> 1. Hack, hack, hack >> 2. Commit >> 3. Push, woops, reject (non-ff) >> 4. Pull >> 5. Push > > Just do pull --rebase? This is essentially the same as what SVN > used to do in your setup. That's not necessarily a good solution either. For teams that don't use rebase, it can leave them with their newly committed stuff now rebased on the work from upstream--duplicating commits without understanding why and where they came from, especially if other branches were built on top of that one. I agree in concept, but in practice it can be quite confusing. :-( -John -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html