I have my `master` I created a branch `aftersales`
Today I finalised `aftersales` and commenced a merge. There were a few conflicts which I worked through and fixed, committed and finished merge. When I published to my staging server, it wasn't working so I went back and checked the code... A part of the code was missing... So I checked out `aftersales` again to find out what happened... I checked and the code was there in the `aftersales` branch... I went back to `master` and the code wasn't there... How could this be? I merged a branch and there was code sitting on the branch but not in the `master` I tried to merge again ... $ git merge aftersales Already up-to-date. WTF? What do I do now? Biggest concern: How much other code was "ignored" in the merge... How do I get the code into master??? (Obviously I can make changes directly into master, copying the changes in but... I'm sure that is not the intended git process???) -- 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/f1c7946f-bd57-4f5f-a427-5e40097aa72b%40googlegroups.com.
