Hi Nicolas, On Fri, Jun 4, 2021 at 11:06 AM Nicolas George <geo...@nsup.org> wrote: > I do not understand: you did send them as a large patch series. Twice, > by the way, which is confusing.
Yes, the first series got messed up, send it a second time correctly. I've cleaned up patchwork, it only shows the right ones. I have sent multiple patch series, all of which apply cleanly to master, but some of which heavily conflict with each other. E.g. https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=4090, https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=4088 and https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=4100 implement different features, but each heavily edit overlapping code. Once one is merged, the others will conflict. Should i put these all in one large series implementing multiple features? > It is the way to do it: make clean commits in your Git tree, using > rebase if necessary to make them really clean. Then let git format-patch > or send-email make a patch series, with each patch stacking on top of > the other. Thanks! send-email I have made some mistakes with my first times here, sorry again for the double patches. Cheers, Dee _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
