On Friday 04 November 2011 15:05:18 Alberto Villa wrote: > Last case I can think of: *.1 revision. You tag 0.x.y from master, and then > merge feature A to it. But people starts screaming that 0.x.y removes > root partition. So you checkout tag 0.x.y (all these tasks are *instant* in > Git), branch off from it, delete the "rm -rf /*` hidden in Kdenlive > configuration wizard, and tag 0.x.y.1 from the branch. To complete the > operation, you merge the branch into master (and solve potential > conflicts, should the `rm -rf /*` have been changed to `sudo rm -rf /*` in > master).
Oh, and you then merge master to next. ;) -- Alberto Villa, FreeBSD committer <avilla at FreeBSD.org> http://people.FreeBSD.org/~avilla Never try to outstubborn a cat. -- Lazarus Long, "Time Enough for Love" -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 314 bytes Desc: This is a digitally signed message part. URL: <http://mail.kde.org/pipermail/kdenlive/attachments/20111104/083d7aa4/attachment.sig>