i do have a quite trivial git-related question, but for some reason I was not able to find a satisfactory answer by myself and I feel embarrassed to ask my colleagues.
I also have to say, that I do generally understand git but i am new to gitlab (which is used in my company).
So my problem is the following: I made a change request for a bug fix two weeks ago. The review took some time and only yesterday I managed to address the review comments. For this i checked out the change request branch did my changes and pushed it back. In the meantime the remote master diverged quite a lot and requires me to do somethin about it.
I my previous company we used a different workflow and i would just rebase my branch on top of the master and push. With gitlab one rather merges the master branch into the feature branch (at least that is what i heard). When i do that it creates a huuuuuuuge commit which consist of the delta between my feature branch (based on the master 2 weeks ago) and the current master.
I am not sure, whether that is the best way or a way at all. Can anyone tell me (or hint me to some good tutorial) how i can resolve my mess?