Hi Shannon, >I think I know what happened now after analysis.
That's good news. A chance to mark it all up as a 'learning experience' after the initial frustrations. I hadn't realised that you could get into that issue on GitLab. Maybe as the repo owner, the "request" was automatically accepted, even though you got to cancel it later. dunno. Glad it's resolved. P. On 19/05/2020 00:31, SJW wrote: > I think I know what happened now after analysis. > I followed the message I received when I pushed the branch to origin: > > remote: > remote: To create a merge request for payment-gateway, visit: > remote: > > https://gitlab.com/SJW/absee/-/merge_requests/new?merge_request%5Bsource_branch%5D=aftersales > remote: > > I then realised that I should do be doing it on local machine so I > cancelled and deleted the merge request BUT, looking at the GitLab > history, it shows in the merge history so I am guessing that this was > the problem... > > I found that it was only the one line that didn't get included which > was the last change I made which lead me to the above assumption. So I > manually added it to master an moved on > > On Monday, 18 May 2020 18:28:56 UTC+10, Philip Oakley wrote: > > 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 > Alreadyup-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/ebf390e5-3303-567e-102d-41dbb503c7e7%40iee.email.
