<table><tr><td style="">ltoscano added a comment.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D5545" rel="noreferrer">View Revision</a></tr></table><br /><div><div><blockquote style="border-left: 3px solid #8C98B8;
color: #6B748C;
font-style: italic;
margin: 4px 0 12px 0;
padding: 8px 12px;
background-color: #F8F9FC;">
<div style="font-style: normal;
padding-bottom: 4px;">In <a href="https://phabricator.kde.org/D5545#104069" style="background-color: #e7e7e7;
border-color: #e7e7e7;
border-radius: 3px;
padding: 0 4px;
font-weight: bold;
color: black;text-decoration: line-through;" rel="noreferrer">D5545#104069</a>, <a href="https://phabricator.kde.org/p/ouwerkerk/" style="
border-color: #f1f7ff;
color: #19558d;
background-color: #f1f7ff;
border: 1px solid transparent;
border-radius: 3px;
font-weight: bold;
padding: 0 4px;" rel="noreferrer">@ouwerkerk</a> wrote:</div>
<div style="margin: 0;
padding: 0;
border: 0;
color: rgb(107, 116, 140);"><p>Yeah that was why I was asking. :(</p>
<p>Thanks for the pointer on adding the remote branch with <tt style="background: #ebebeb; font-size: 13px;">arc land</tt> though, that's very useful to know!</p>
<p>Also, thanks for cleaning this up for me. (I suspect being able to force push would come in handy right about now, <tt style="background: #ebebeb; font-size: 13px;">git checkout <hash> && git push -f origin master</tt></p></div>
</blockquote>
<p>We don't allow force pushing, for good reasons. I asked the sysadmins (usually with a ticket from phabricator, but they were online).</p>
<blockquote style="border-left: 3px solid #a7b5bf; color: #464c5c; font-style: italic; margin: 4px 0 12px 0; padding: 4px 12px; background-color: #f8f9fc;"><p>When done, should I simply re-do the merge properly with <tt style="background: #ebebeb; font-size: 13px;">arc land origin/frameworks</tt> ?</p></blockquote>
<p>And I was wrong again: <tt style="background: #ebebeb; font-size: 13px;">arc land --onto frameworks</tt> .<br />
Just apply the commit cleanly to the top of frameworks. Please check the local history with git log/qgit/gitk.</p>
<p>PS. in case you want to jump on IRC, other people can help too.</p></div></div><br /><div><strong>REPOSITORY</strong><div><div>R417 KSudoku</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D5545" rel="noreferrer">https://phabricator.kde.org/D5545</a></div></div><br /><div><strong>To: </strong>ouwerkerk, KDE Games, ltoscano<br /><strong>Cc: </strong>ltoscano, KDE Games<br /></div>