Re: [keycloak-dev] rebasing

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 srossillo(a)smartling.com