Closed Jay-sanjay closed 11 months ago
Thank you! Unfortunately the word "continuation" must stay as it is. It cannot become "continuate". While this word may not exist in a dictionary, it is an established word in the wide dynamical systems community.
soft reset
@Jay-sanjay
ivan has a personal access token
ivan forks a repo and then clones via https that forked repo
after editing some of the clone's files and cd'ing to the top level of the clone
git init git add . git commit -m "typo fixes" git push -u origin main
the commit has been made to the fork
ivan creates a pull request in the upstream repo
then is noticed an additional fix is indicated
as an example adding the additional fixes from the top level of the clone
sed -i "s/re-appear/reappear/g" docs/src/index.md sed -i "s/re-appears/reappears/g" src/continuation/match_attractor_ids.jl
ivan for the second commit to the forked repo used the commit message "remove hyphens"
but the pull request has not been merged yet to the upstream repo
to perform a soft reset ivan in the context of the above would do the following; ~2
refers to the last two commits
git reset --soft HEAD~2 git commit -m "typo fixes" git push -f origin main
ivan would see in the shell output for the last command the content as
forced update
one commit with the name "typo fixes" which results in a cleaner commit history when merged to the upstream repo
closes #113 fixed several typo errors