[Kdenlive-devel] Git workflow

[Mikko Rapeli]

On Mon, Nov 07, 2011 at 12:15:47AM +0100, Alberto Villa wrote:
> On Friday 04 November 2011 15:51:30 Mikko Rapeli wrote:
> > Branching, merging and rebasing (fast forwarding branches to newer
> > baseline) are so easy in git that they don't need to be defined. Just
> > treat git master branch as svn trunk, but revert commits or features if
> > they cause problems, and use feature branches for development.
> 
> Reverting sets of commits is definitely not a solution.

Yes it is. If a set of commits breaks other functionality, those patches
should either be fixed or reverted. That's how Linux kernel is maintained.

There's nothing wrong in reverting a set of patches, asking the author to fix
them, and applying a fixed version later on.

This gives the tree maintainer some options to keep the master branch in
releasable state.

-Mikko