{"thread":{"id":"48748","subject":"After merging and reset I am on unexpected commit","startedAt":"2018-06-21T09:28:21Z","lastAt":"2018-06-21T09:28:21Z","messageCount":1,"participants":["KES"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"350617","messageId":"189781529572854@web55j.yandex.ru","threadId":"48748","inReplyTo":null,"subject":"After merging and reset I am on unexpected commit","fromName":"KES","fromEmail":"kes-kes@yandex.ru","sentAt":"2018-06-21T09:20:54Z","receivedAt":"2018-06-21T09:28:21Z","isPatch":false,"sender":{"key":"kes-kes@yandex.ru","avatar":null},"body":"Hi.\n\nI am on my current branch. \n\n$ git log --graph --decorate --pretty=oneline --abbrev-commit\n* 5b85d64 (HEAD -> SCTT_for_other_tables) Implement script to test CORS\n* f45a919 Create SCTT for Contractor\n* 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement\n* 7e4cac9 Create SCTT for Language\n* a0607d1 Fixed broken tests for 'Person'\n* 1d0a1b2 Create SCTT for DocumentFile\n* 92837c1 Fix SQL quoting problem\n\n\nI want to pull new changes and apply mine on top of them\n\nI do `git pull -v -r`\n\nkes@work ~/t $ git pull -v -r amazon SCTT_for_other_tables \nFrom amazon:/v1/repos/tucha\n * branch            SCTT_for_other_tables -> FETCH_HEAD\n = [up to date]      SCTT_for_other_tables -> amazon/SCTT_for_other_tables\nCreated autostash: 97ce867\nHEAD is now at 5b85d64 Implement script to test CORS\nChanges from 5b85d647ecd503cc03b26ed4e33bf8266bc8e96b to a0d92dc11ec11023f6d492497e043170d7128f56:\n lib/MaitreD/Controller/ContractorTypeI18n.pm |  54 +---------------\n public/maitre_d/api-v1.yaml                  | 158 ++++++++++++++++++++++++++++++++++++++++++++++-\n t/MaitreD/contractor_type_i18n.t             | 117 +++++++++++++++++++++++++++++++++++\n 3 files changed, 276 insertions(+), 53 deletions(-)\n create mode 100644 t/MaitreD/contractor_type_i18n.t\nNote: checking out 'a0d92dc11ec11023f6d492497e043170d7128f56'.\n\nYou are in 'detached HEAD' state. You can look around, make experimental\nchanges and commit them, and you can discard any commits you make in this\nstate without impacting any branches by performing another checkout.\n\nIf you want to create a new branch to retain commits you create, you may\ndo so (now or later) by using -b with the checkout command again. Example:\n\n  git checkout -b <new-branch-name>\n\nHEAD is now at a0d92dc Merge branch 'SCTT_for_other_tables' of amazon:/v1/repos/tucha into SCTT_for_other_tables\nRebasing (1/1)\n lib/MaitreD/Controller/ContractorTypeI18n.pm |  54 +--------\n public/maitre_d/api-v1.yaml                  | 158 ++++++++++++++++++++++++++-\n t/MaitreD/contractor_type_i18n.t             | 117 ++++++++++++++++++++\n 3 files changed, 276 insertions(+), 53 deletions(-)\nSuccessfully rebased and updated refs/heads/SCTT_for_other_tables.\nApplying autostash resulted in conflicts.\nYour changes are safe in the stash.\nYou can run \"git stash pop\" or \"git stash drop\" at any time.\n\n\nAs you can see the rebasing is finished successfully except autostash is not applied\n\n\n$ git log --graph --decorate --pretty=oneline --abbrev-commit\n*   a0d92dc (HEAD -> SCTT_for_other_tables, amazon/SCTT_for_other_tables) Merge branch 'SCTT_for_oth\n|\\  \n| * 5b85d64 Implement script to test CORS\n* | 0c1ac6c Create SCTT for ContractorTypeI18n\n|/  \n* f45a919 Create SCTT for Contractor\n* 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement\n* 7e4cac9 Create SCTT for Language\n* a0607d1 Fixed broken tests for 'Person'\n\n1. Why I get merge when I ask to rebase?\n\n\nBecause of merge I wanna to roll back that. Thus I reset my merge commit \nkes@work ~/t $ git reset --hard HEAD^\nHEAD is now at 0c1ac6c Create SCTT for ContractorTypeI18n\n\n2. Why I moved to 0c1ac6c Create SCTT for ContractorTypeI18n commit instead of \n5b85d64 Implement script to test CORS?\n\n$ git log --graph --decorate --pretty=oneline --abbrev-commit\n* 0c1ac6c (HEAD -> SCTT_for_other_tables) Create SCTT for ContractorTypeI18n\n* f45a919 Create SCTT for Contractor\n* 702fcdd (xtucha/SCTT_for_other_tables) Create SCTT for PartnershipAgreement\n* 7e4cac9 Create SCTT for Language\n* a0607d1 Fixed broken tests for 'Person'\n* 1d0a1b2 Create SCTT for DocumentFile\n\n\nBecause of this the commit:5b85d64 Implement script to test CORS \nis lost\n\nIt is not on any branch and with less attention it will be forgotten.\n\n\nIs this behavior expected? Maybe I do something wrong?\n"}]}