<html> <head> <meta content="text/html; charset=windows-1252" http-equiv="Content-Type"> </head> <body text="#000000" bgcolor="#FFFFFF"> I can't seem to sort how to merge from your repos. Everytime it states nothing we can merge. This has not been applied. Sorry. Scarlett <div class="moz-cite-prefix">On 04/16/2015 12:46 PM, José Manuel Santamaría Lema wrote: </div> <blockquote cite="mid:201504162147.24638.panfaust@gmail.com" type="cite"> <pre wrap="">Hi, current kde-dev-scripts doesn't build from git's kubuntu_vivid_backports branch, I have merged kubuntu_vivid_archive into kubuntu_vivid_backports and pushed the proposed change to this repository: <a class="moz-txt-link-freetext" href="https://gitlab.com/siduction-kde-applications/kde-dev-scripts">https://gitlab.com/siduction-kde-applications/kde-dev-scripts</a> in the kubuntu_vivid_backports_tmp branch: <a class="moz-txt-link-freetext" href="https://gitlab.com/siduction-kde-applications/kde-dev-scripts/commits/kubuntu_vivid_backports_tmp">https://gitlab.com/siduction-kde-applications/kde-dev-scripts/commits/kubuntu_vivid_backports_tmp</a> I'm not attaching the patches with git format-patch because a merge is involved, sorry. </pre> <fieldset class="mimeAttachmentHeader"></fieldset> </blockquote> </body> </html>