Squishing my commits

[JavaJoeS]

Been using git for some number of years, Squishing down commits is new to me. I found tons of examples all over, but no recommendations in our Eclipse Foundation docs. Which is preferred; using Eclipse or command line? What are "our" steps
that we need to follow?

[fedejeanne]

This is probably cleared by now but my 2 cents on the issue are:

Option 1: Amend + Force-Push

If you currently only have 1 commit in your branch, you can amend it

... and then you force-push the commit to your PR-branch

Option 2: Interactive rebase + Force-Push

If you have several commits that you want to squash together then you do an interactive rebase on master, pick the 1st commit and squash the rest

... and then you force-push the commit to your PR-branch

Does this answer your question?

[HeikoKlare]

Just one nitpicky remark: Force pushing is always necessary when changing commits that have already been pushed, no matter if its via an amendment or via a rebase, so for both option 1 and 2.