<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">2017-06-27 12:06 GMT+02:00 Fabian Greffrath <span dir="ltr"><<a href="mailto:fabian@greffrath.com" target="_blank">fabian@greffrath.com</a>></span>:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">Jaromír Mikeš wrote:<br></span></blockquote><div><br></div><div>Hi Fabian,<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">
> Can someone advise me how to fix it pls?<br>
<br>
</span>Do you have any patches applied? If yes, unapply them before attempting to<br>
merge the new upstream release.<br>
<br>
If this doesn't help, try calling "git checkout -- " on the files git<br>
complains about.<span class="HOEnZb"><font color="#888888"><br></font></span></blockquote><div><br></div><div>Tried this now but it didn't help :(<br><br></div><div>best regards<br><br></div><div>mira <br></div></div><br></div></div>