git rebase -i is helpful for merging together local commits.

Say you did 5 commits and they’re really a single feature. I usually, do:

git rebase -i HEAD~5 and use “fixup” to make them one commit.

Lastly, before pushing to create a PR, I rebase on master. This shouldn’t be interactive unless there are conflicts.  That’s just a:

git checkout master
git pull -r
git checkout feature-branch
git rebase master

Scott Rossillo
Smartling | Senior Software Engineer

On Feb 29, 2016, at 9:54 AM, Bill Burke <> 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

keycloak-dev mailing list