I had a bug in my code so I branched master to `bugfix-333` and I added a `var_dump();` in the code to debug. I then found the problem, fixed it, committed and merged `bugfix-333` into `staging` branch. I then realised that I'd left the `var_dump();` in the code so i checked out the `bugfix-333` again and deleted the `var_dump()` I again committed the code this time using `git commit --amend` Then I checked out `staging` and merged `bugfix-333` again
BUT ... the var_dump() is still there in staging? I checked out `bugfix-333` and the code is gone. I tried again, checked out `staging` and ran `git merge bugfix-333` but now I get: Already up to date. But it's not??? Is this a bug or a "feature"? -- 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/74e1b44e-2cf7-4f90-96d3-80d2ef178570n%40googlegroups.com.
