Which way did you merge? did you merge the what was in master into aftersales, or the other way around?
Have you used a repository viewer like gitk which will show where the two branches are pointing to and the changes that each commit / merge has? Can you show a small extract of you difficultly, such as a diff of one erroneous file between master and aftersales, with a description of why it is 'wrong'. P. On Monday, May 18, 2020 at 3:06:04 AM UTC+1, SJW wrote: > > 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 [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/6e134c95-a144-4d09-81db-8351d2cc2e34%40googlegroups.com.
