[Kde-pim] Git commit policy

[David Jarvie]

On Wed, December 26, 2012 6:21 pm, Sérgio Martins wrote:
> 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.

I also don't recall any decision to use merge. I've avoided that since I
presume that would involve sorting out other people's conflicts - or am I
wrong?

-- 
David Jarvie.
KDE developer.
KAlarm author - http://www.astrojar.org.uk/kalarm

_______________________________________________
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/