On Fri, Jul 31, 2015 at 09:54:52PM +0200, Michael Niedermayer wrote: > On Fri, Jul 31, 2015 at 09:27:00PM +0200, Michael Niedermayer wrote: > > On Fri, Jul 31, 2015 at 05:37:12PM +0200, Clément Bœsch wrote: > > [...] > > > So in order for the community to continue this, I'd say we probably need > > > to have some help for: > > > > > > - guidelines on the merge strategies > > > > The merge process i used is quite simple > > one trick i forgot
another thing that comes to mind when merges are done 1 commit at a time bisect works fine if merging more commits in a single merge then bisect will end on the libav tree and whatever test one has will generally not work on libav in a meaningfull way. So using only 1 commit per merge helps with future bisectability alot. [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The educated differ from the uneducated as much as the living from the dead. -- Aristotle
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
