[keycloak-dev] rebasing

[Bill Burke]

can you do that after you've committed your local repo without screwing 
anything?

On 2/29/2016 10:23 AM, Stian Thorgersen wrote:
> I just do:
>
> git fetch upstream
> git rebase upstream/master
>
> And that's it
>
> On 29 February 2016 at 15:54, Bill Burke <bburke at redhat.com 
> <mailto:bburke at redhat.com>> wrote:
>
>     How you guys do this?  I did a rebase -i and squashed everything
>     but the
>     PR contained diffs of merged files and not just my changes.
>
>     --
>     Bill Burke
>     JBoss, a division of Red Hat
>     http://bill.burkecentral.com
>
>     _______________________________________________
>     keycloak-dev mailing list
>     keycloak-dev at lists.jboss.org <mailto:keycloak-dev at lists.jboss.org>
>     https://lists.jboss.org/mailman/listinfo/keycloak-dev
>
>

-- 
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.jboss.org/pipermail/keycloak-dev/attachments/20160229/8bc0e8cd/attachment-0001.html