[Kde-pim] Git commit policy

[Sérgio Martins]

On Wednesday, December 26, 2012 17:19:46 Andras Mantia wrote:
> Sérgio Martins wrote:
> > Hi,
> > 
> > 
> > We now have a page documenting kdepim git commit policy:
> > http://community.kde.org/KDE_PIM/Development/GitCommitPolicy
> > 
> > It mostly talks about how we handle forward porting.
> > 
> > Nothing in this page is new, we've been doing and enforcing this workflow
> > for months, I just wrote it down.
> 
> Sorry to ask, but was this discussed?

I've been told to use merge months ago, and some others have been yelled at, 
so I guess it was discussed at some point (maybe only on irc?).

> It *is* new. I've been using master as
> my main branch for years.

We only have git since 2 years :). Before that, merge wasn't an option.


Let's not start a merge VS cherry-pick bikeshed. It has been thoroughly 
discussed before, in many places, including kde-core-devel.

So lets just reuse the conclusions of previous discussions.

Maybe a kde-core-developer can post a 5 line summary (technical arguments only 
please) of that huge thread on k-c-d ?

I recall Thiago and DFaure where active on the mailling list at the time, 
adding them to CC then.


> 
> IMO with every new policy a kitten dies, and I like kittens. :)

Laurent will kill a kittie if you don't merge :)

But seriously, if we accept cherry-picking we still need a policy page, 
saying, for example, that you must use the -x flag.




Regards,
Sérgio Martins


_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/