These are chat archives for boostorg/hana
time clang++ ….
push —forceing to update the PR?
The following should work. Execute the commands one by one, and make sure it makes sense at each step, because I haven't proofread the steps and I don't want to delete your whole hard drive:
git checkout the-name-of-your-branch # make sure your working directory is clean git rebase -i HEAD~3
A file should pop-up in your default editor. Follow the instructions written in that file. Basically, you should put
squash instead of
pick in front of your 2 last commits. Once you're done, save it and close it. The rebase should take place, and you'll be asked to edit the commit message of the squashed commit; do it. Normally, you'll be left with a single commit containing the changes of your 3 current commits, and with the commit message that you'll have chosen. Now, you can
push --force your new commit to your branch, overwriting the 3 previous commits:
git push --force
Again, take these steps with a grain of salt.
git rebase —interactiveout, it’s wonderful.