On Mon, Mar 20, 2017 at 02:31:46PM -0800, Lou Logan wrote: > On Mon, 20 Mar 2017 15:23:10 +0100 > Paul B Mahol <one...@gmail.com> wrote: > > > Then wait until someone else appears and like to commit this code. > > It would be easier to do for a lazy commit monkey if it was rebased to > current git master: > > error: patch failed: Changelog:12 > error: Changelog: patch does not apply > error: patch failed: libavfilter/version.h:30 > error: libavfilter/version.h: patch does not apply
applied btw, often a simple "git am -3" makes git apply a patch with some conflicts markers that otherwise would fail to apply [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB If you fake or manipulate statistics in a paper in physics you will never get a job again. If you fake or manipulate statistics in a paper in medicin you will get a job for life at the pharma industry.
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
