-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 On 14/09/14 07:21 PM, Patrick Lauer wrote: > On Sunday 14 September 2014 15:42:15 hasufell wrote: >> Patrick Lauer: >>>> Are we going to disallow merge commits and ask devs to rebase >>>> local changes in order to keep the history "clean"? >>> >>> Is that going to be sane with our commit frequency? >> >> You have to merge or rebase anyway in case of a push conflict, so >> the only difference is the method and the effect on the history. >> >> Currently... CVS allows you to run repoman on an outdated tree >> and push broken ebuilds with repoman being happy. Git will not >> allow this. > > iow, git doesn't allow people to work on more than one item at a > time? > > That'd mean I need half a dozen checkouts just to emulate cvs, > which somehow doesn't make much sense to me ... >
I think you'd just need to have a (large) handful of different branches, and squash+cherry-pick into master when you're ready to push. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iF4EAREIAAYFAlQXH08ACgkQ2ugaI38ACPAZ1gD/WfiMZnu3qesaILhPYEKYy2BP MUS2zWJVqYJ8lKp16nUA/1ng1mMxX6pNKZVYIaT/BFuERKz3g0BcLck+XILs3Hth =Ul7F -----END PGP SIGNATURE-----
