Silvio Moioli wrote: ... % So we prefer merging master into master-bootstrap-css-fixes from time to % time, because this does not require force pushing, that is talking % to/stopping 6 people every time master changes significantly (and it % does, see for example 559ab061). % % I asked Tomáš Kašpárek if this was acceptable: % % <moio> tkasparek: since various people work on % master-bootstrap-css-fixes here, we do not really like force pushing. At % the moment we are merging master back to the branch from time to time - % I hope that you don't mind some extra merge commits % <tkasparek> moio: sure, just do whatever suits you the best % <moio> tkasparek thanks % <tkasparek> np % % I hope this is not really a difficult issue, as I am happy with the % current upstream patch flow that, being quite fast, allows lots of bugs % to be solved efficiently. % % Final note for a future discussion: we would also be very happy if you % had an official GitHub account and could accept pull requests, as we % already do internally. That would also address this problem cleanly in % my opinion!
Hi Silvio, Pushing changes to master-bootstrap-css-fixes is perfectly sane. I was complaining about those one-commit sub-branches which immediatelly merge back to the master-bootstrap-css-fixes branch. Regards, -- Michael Mráka Satellite Engineering, Red Hat _______________________________________________ Spacewalk-devel mailing list Spacewalk-devel@redhat.com https://www.redhat.com/mailman/listinfo/spacewalk-devel
