On 18/04/2026 12:01, Michael Van Canneyt via fpc-devel wrote:
You were conveniently ignoring this part in your reply. You have to
handle the user's MRs in gitlab.
I thought the part where I wrote
2) --- the actual "cherry pick this MR" ---
That is fine online (and I said that before!). But I also said: only
if I do it immediately.
I.e. When/If I do it as part of this handling.
That is not always the case. (and the other obstructions)
So, no: I did not ignore that.
Which is exactly what I am doing:
Merge Requests Grouped by User:
This is probably mixing 2 things up now (I still reply just in one bit)
- merging into main (which was *not* the topic / and which I do to,
except cases that I described separately)
- using the cherry-pick button.
That list is
- merging them into main
- merging them, and cherry picking them into fixes **at the same time**
- merging them, and cherry picking them into fixes **at a later time**
?
And:
- How big where they.
- How much review was needed
- How much code in places **not adjacent to the diff** needed to be
looked up for the review
- How many of them needed conflict resolution
On the last point: It may be that for you conflict resolution works fine
in the gitlab interface.
For me, that is - half the time - not the case.
I do regularly open conflicts (with the >>>> markers) in the IDE, and
resolve them there. It's just for me personally that works better in
those cases.
----------------------
I am missing your response to the following.
Which is
- *NOT* about MR from 3rd party
- but about every team member adding every change via MR (so then that
could be used for merge tracking to fixes)
Also, I must say, if I understand that correct, and if every change
(including every single commit fix) goes through an MR, then you have
hundreds (thousands?) of MR => Essentially the entire "git history"
duplicated into MR => not something that I find reasonable.
This may be based on some misunderstanding by me => but then I would
like to know it what I misunderstood.
_______________________________________________
fpc-devel maillist - [email protected]
https://lists.freepascal.org/cgi-bin/mailman/listinfo/fpc-devel
