[Kde-scm-interest] Meeting minutes

[Oswald Buddenhagen]

On Mon, Nov 16, 2009 at 01:26:16PM -0800, Chani Armitage wrote:
> what's p4i? what does "merge up" mean? :)
> 
:D
p4i is a troll-internal script. it kinda-automated forward-porting
changes from stable to master when we still used perforce (p4).
in git, you just check out master and "git merge stable" to get *all*
changes from stable (that's also the basis for the "merging mess"
discussion). that's called "merging up" or forward-merging, or whatever
one decides to call it.
the alternative to using git's merging feature whould be cherry-picking
individual changes. that's about as comfortable as forward-/back-porting
in svn without merge tracking (i.e., what we've done since the dawn of
times). but you really don't *want* that.