Re: My preference to use Merge Requests and examples of them in practice for both package updates and new packages
On Fri Aug 1, 2025 at 3:02 PM CEST, Nilesh Patra wrote:
A bit of an annoyance that I find with MRs for updates is that there
are at least 2 branches (debian/sid and upstream) and there are 2 MRs
for the same.
Also some folks want to store the exact same git history as upstream
in the upstream branch. MRs will add a salsa/gitlab based commit when
merged.
Do you have any good ways to handle these? For upstream updates
I usually just ask people to push directly due to this.
The way I personally handle this is by locally merging the relevant
branches with git, and then pushing to Salsa. To do this, you need to
first add the forked repo as a remote, with something like
`git remote add -f nilesh https://salsa.debian.org/nilesh/aerc.git`.
The merge request will properly be marked as merged, and no strange
commits or double-MRs are needed.
Hope this is useful to you! Bye :)
Reply to: