Re: [keycloak-dev] rebasing

I just do: git fetch upstream git rebase upstream/master And that's it On 29 February 2016 at 15:54, Bill Burke <bburke(a)redhat.com <mailto:bburke@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(a)lists.jboss.org <mailto:keycloak-dev@lists.jboss.org> https://lists.jboss.org/mailman/listinfo/keycloak-dev