|
From: Raphael N. <rne...@hs...> - 2012-07-20 18:30:49
|
> > I took a look at the per site settings patch, but it didn't apply to > master cleanly: > Applying: moving all internal flags into a new global struct of the type VSettings > vimprobable/.git/rebase-apply/patch:415: space before tab in indent. > strncat(temp, file_url, 1); > vimprobable/.git/rebase-apply/patch:416: space before tab in indent. > file_url++; > error: patch failed: config.h:1 > error: config.h: patch does not apply > Patch failed at 0001 moving all internal flags into a new global struct of the type VSettings > When you have resolved this problem run "git am --resolved". > If you would prefer to skip this patch, instead run "git am --skip". > To restore the original branch and stop patching run "git am --abort". > > Am I doing something wrong? Or should the patches be rebased to current master first? Never mind that, I saw there is a branch per-site-settings in the git://git.code.sf.net/p/vimprobable/code repository |
