<html>
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
can you do that after you've committed your local repo without
screwing anything?<br>
<br>
<div class="moz-cite-prefix">On 2/29/2016 10:23 AM, Stian Thorgersen
wrote:<br>
</div>
<blockquote
cite="mid:CAJgngAemh3Cz606OiEzp9r25trezGe-352oQZK6mXmPSn8KUzw@mail.gmail.com"
type="cite">
<div dir="ltr">I just do:
<div><br>
</div>
<div>git fetch upstream</div>
<div>git rebase upstream/master</div>
<div><br>
</div>
<div>And that's it</div>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">On 29 February 2016 at 15:54, Bill
Burke <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:bburke@redhat.com" target="_blank">bburke@redhat.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex">How you
guys do this? I did a rebase -i and squashed everything but
the<br>
PR contained diffs of merged files and not just my changes.<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
Bill Burke<br>
JBoss, a division of Red Hat<br>
<a moz-do-not-send="true"
href="http://bill.burkecentral.com" rel="noreferrer"
target="_blank">http://bill.burkecentral.com</a><br>
<br>
_______________________________________________<br>
keycloak-dev mailing list<br>
<a moz-do-not-send="true"
href="mailto:keycloak-dev@lists.jboss.org">keycloak-dev@lists.jboss.org</a><br>
<a moz-do-not-send="true"
href="https://lists.jboss.org/mailman/listinfo/keycloak-dev"
rel="noreferrer" target="_blank">https://lists.jboss.org/mailman/listinfo/keycloak-dev</a><br>
</font></span></blockquote>
</div>
<br>
</div>
</blockquote>
<br>
<pre class="moz-signature" cols="72">--
Bill Burke
JBoss, a division of Red Hat
<a class="moz-txt-link-freetext" href="http://bill.burkecentral.com">http://bill.burkecentral.com</a></pre>
</body>
</html>