<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">git rebase -i is helpful for merging together local commits.<div class=""><br class=""></div><div class="">Say you did 5 commits and they’re really a single feature. I usually, do:</div><div class=""><br class=""></div><div class="">git rebase -i HEAD~5 and use “fixup” to make them one commit.</div><div class=""><br class=""></div><div class="">Lastly, before pushing to create a PR, I rebase on master. This shouldn’t be interactive unless there are conflicts. That’s just a:</div><div class=""><br class=""></div><div class="">git checkout master</div><div class="">git pull -r</div><div class="">git checkout feature-branch</div><div class="">git rebase master</div><div class=""><br class=""></div><div class=""><br class=""></div><div class=""><br class=""><div class="">
<div style="color: rgb(0, 0, 0); letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px; word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">Scott Rossillo</div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">Smartling | Senior Software Engineer</div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class=""><a href="mailto:srossillo@smartling.com" class="">srossillo@smartling.com</a></div><div style="color: rgb(0, 0, 0); font-family: Helvetica; font-size: 12px; font-style: normal; font-variant: normal; font-weight: normal; letter-spacing: normal; orphans: auto; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; widows: auto; word-spacing: 0px; -webkit-text-stroke-width: 0px;" class="">
</div>
</div></div><br class=""><div><blockquote type="cite" class=""><div class="">On Feb 29, 2016, at 9:54 AM, Bill Burke <<a href="mailto:bburke@redhat.com" class="">bburke@redhat.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div class="">How you guys do this? I did a rebase -i and squashed everything but the <br class="">PR contained diffs of merged files and not just my changes.<br class=""><br class="">-- <br class="">Bill Burke<br class="">JBoss, a division of Red Hat<br class=""><a href="http://bill.burkecentral.com" class="">http://bill.burkecentral.com</a><br class=""><br class="">_______________________________________________<br class="">keycloak-dev mailing list<br class="">keycloak-dev@lists.jboss.org<br class="">https://lists.jboss.org/mailman/listinfo/keycloak-dev<br class=""></div></div></blockquote></div><br class=""></div></body></html>