<div dir="ltr"><div>+1 for this. I too face the issue with losing old changes once a new commit is pushed.</div><div><br></div><div><div dir="ltr" class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr">Regards,<br></div><div>Sheetal Pamecha<br></div></div></div></div></div><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Oct 15, 2020 at 4:03 PM Xavi Hernandez <<a href="mailto:xhernandez@redhat.com">xhernandez@redhat.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr">Hi all,<div><br></div><div>after the recent switch to GitHub, I've seen that reviews that require multiple iterations are hard to follow using the old workflow we were using in Gerrit.</div><div><br></div><div>Till now we basically amended the commit and pushed it again. Gerrit had a feature to calculate diffs between versions of the patch, so it was relatively easy to follow the changes between iterations (unless there was a big change in the base branch and the patch was rebased).</div><div><br></div><div>In GitHub we don't have this feature (at least I haven't seen it). So I'm proposing to change this workflow.</div><div><br></div><div>The idea is to create a PR with the initial commit. When a modification needs to be done as a result of the review, instead of amending the existing commit, we should create a new commit. From the review tool in GitHub it's very easy to check individual commits.</div><div><br></div><div>Once the review is finished, the patch will be merged with the "Squash and Merge" option, that will combine all the commits into a single one before merging, so the end result will be exactly the same we had with Gerrit.</div><div><br></div><div>Another thing to consider is that rfc.sh script always does a rebase before pushing changes. This rewrites history and changes all commits of a PR. I think we shouldn't do a rebase in rfc.sh. Only if there are conflicts, I would do a manual rebase and push the changes.</div><div><br></div><div>What do you think ?</div><div><br></div><div>Regards,</div><div><br></div><div>Xavi</div></div>
_______________________________________________<br>
<br>
Community Meeting Calendar:<br>
<br>
Schedule -<br>
Every 2nd and 4th Tuesday at 14:30 IST / 09:00 UTC<br>
Bridge: <a href="https://bluejeans.com/441850968" rel="noreferrer" target="_blank">https://bluejeans.com/441850968</a><br>
<br>
<br>
<br>
<br>
Gluster-devel mailing list<br>
<a href="mailto:Gluster-devel@gluster.org" target="_blank">Gluster-devel@gluster.org</a><br>
<a href="https://lists.gluster.org/mailman/listinfo/gluster-devel" rel="noreferrer" target="_blank">https://lists.gluster.org/mailman/listinfo/gluster-devel</a><br>
<br>
</blockquote></div>