Hello,

I have only ever used git in very very basic way: commit, branch, merge request, that’s pretty much it.

I have a use case where I pull the repository locally, branch (let’s call it branch1), write some code, test it, commit, then create a merge request to master branch.

The merge request takes some time to be approved. During that time I would like to add more edits on top of those I submitted in the merge request. What would be the correct steps here?

  • GarytheSnail@programming.dev
    link
    fedilink
    arrow-up
    1
    ·
    1 year ago

    If you have zero idea when but you assume it will be merged at some point, I think you’ve got the right idea.

    Do you know the merge strategy of the remote? Is it fast forward only, merge commit, squash then merge commit?