larida

joined 1 year ago
[–] [email protected] 1 points 1 year ago (3 children)

ok, so a "merge request" can be viewed as "merge of branch1 into master will happen at a time I cannot control".

Now, branch1 is checked out, if I do git switch -c branch2, it will start a new branch2 based on the last commit from branch1, right? I feel it's safer, since I don't know when branch1 will merge, server-side.

 

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?