Git

2910 readers

1 users here now

Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

Resources

Rules

Follow programming.dev rules
Be excellent to each other, no hostility towards users for any reason
No spam of tools/companies/advertisements. It’s OK to post your own stuff part of the time, but the primary use of the community should not be self-promotion.

Git Logo by Jason Long is licensed under the Creative Commons Attribution 3.0 Unported License.

founded 1 year ago

MODERATORS

Ategon

canpolat

jnovinger

Branching and Merging question (lemmy.sdf.org)

submitted 1 year ago by [email protected] to c/git

5 comments fedilink hide all child comments

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?

you are viewing a single comment's thread
view the rest of the comments

[–] GarytheSnail 1 points 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?