On 10/12/13 11:03, Michael Mraka wrote: > Heya Spacewalk commiters, > > > I've noticed recently that our git repo is a bit weird looking. > I'm talking about commit sequences > a291087ad5ef010074ad2d4b1679fcc2cdf667c5..0f49b04dc9c6062a2fd6f480449270123ff7f6b7 > and > 742472c23d67b6d62730c329d09e1bdac63bd22b..0bfcd3c4029fcf886e3ab5001a7dc75860457095. > > What's wrong with them? As for code changes they are OK. The way they've > been forked / merged / re-merged and finally pushed made git repo pretty > messy. > As human brain is mostly used to think in linear timeline it's easy e.g. > to look for bugs in linear sequence of code changes but you will very > quickly get lost in the number of parallel branches. > > That's why our golden rule is - don't merge, rebase - it's an easy way > to keep git repo as much linear as possible.
We explicitly asked about this on irc. The issue is was how to work all the UI issues in a branch. Rebasing work if we only push, but not if others contribute to that branch. -- Duncan Mac-Vicar P. - http://www.suse.com/ SUSE LINUX Products GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Maxfeldstraße 5, 90409 Nürnberg, Germany _______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
