I have been working on a feature-branch - made a few commits and ready for testing.
I `git checkout staging` branch, merge in feature-branch and then push it to the staging server. While testing in staging I realise I have left some logging on or something else minor. I checkout feature-branch again and remove the logging BUT this time when committing, instead of a brand new commit, I use `git commit --amend` I `git checkout staging` branch again, merge in feature-branch again and then push it to the staging server. BUT ... the last changes committed via `--amend` are not present. This isn't the first time this has happened so I am guessing it's not something I have done, it's actually a "feature" of git. Is this correct? Do amends not merge? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/9bac56cf-348f-46b7-bb29-cbf61c32b06en%40googlegroups.com.
