Correction, I had to do a git rebase -i HEAD~2 but the two commits are squashed together now.
-----Original Message----- From: Interrante, John A (GE Research, US) <john.interra...@ge.com> Sent: Monday, June 28, 2021 3:38 PM To: dev@daffodil.apache.org Subject: EXT: RE: Squash last commit and newest commit I force pushed the new squashed commit to the dependabot branch and found out it wouldn't merge because of a conflict with the master branch. I had to rebase the commit again with a git rebase asf/master and we still have two sequential commits in history with the same title. I'll check out the master branch and do a git rebase -i HEAD~ to squash them together, then do a force-push directly to the master branch. Just a few more minutes and then all should be done. -----Original Message----- From: Interrante, John A (GE Research, US) <john.interra...@ge.com> Sent: Monday, June 28, 2021 3:19 PM To: dev@daffodil.apache.org Subject: EXT: Squash last commit and newest commit The last (latest) commit on the master branch is still Bump sonarsource/sonarcloud-github-action from 1.5 to 1.6 * apache/daffodil@303cb5a<https://github.com/apache/daffodil/commit/303cb5ab404336860195d65819505dfbfd8dab66> which broke CI because it was missing one change. After I merge the new pull request Bump sonarsource/sonarcloud-github-action from 1.5 to 1.6 by dependabot * Pull Request #598 * apache/daffodil<https://github.com/apache/daffodil/pull/598>, I don't want to have two sequential commits touching some of the same files; I think we should consider these two commits one unit of change, not two. I want to squash these two commits together (last and newest) so we'll have only a single commit in history. I have already performed the squash within the pull request itself (instead of git rebase -i asf/master, I did a git rebase -i asf/master~1). Once I push that new commit to the dependabot branch and merge the new pull request, I believe we will have only one commit in history with the title "Bump sonarsource/sonarcloud-github-action from 1.5 to 1.6". May I have a +1 to proceed as proposed above? John
