Re: updating merge request

[Aaron Hill]

On 2023-01-19 8:54 pm, David Zelinsky wrote:
> Am I misunderstanding something?  Or is what it says in 3.2 a mistake?

If GitLab works similar to GitHub (which I have more experience with), 
any new commits to your branch should automatically be picked up as part 
of the open merge/pull request.  When accepting the request, there is an 
option to rebase or squash, although some project owners will ask that 
the original submitter manually do this before accepting, but again this 
is all being done in the same branch of the pending request.

I think 3.2 might only be advising against creating a *new* branch and 
submitting another request.  But the --amend instruction seems odd as 
that is usually about correcting an incomplete commit, for instance when 
a file that was supposed to be staged was missed.  It looks clunky to 
have a second commit when you can often get away with fixing up the 
original commit to be complete.  Otherwise, you are basically rewriting 
history, and that is a general no-no.  One should let all commits sit 
clearly in the open during review and then at the end squash or rebase 
or whatever before merging based on how one prefers the main line to 
look.


-- Aaron Hill