Re: Gitlab Migration

[Daniel Brooks]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> Indeed.  But I expect that whatever we end up with, we (that is, the
>> Emacs maintainers) won't have to click around, and won't have to
>> actually merge anything directly.  That is, I expect to have a command
>> in Emacs that says "get that pull request as a patch, apply it, and
>> don't commit it".  So that we can fix stuff up before committing -- as
>> before.
>
> Personally I tend to just use `git am` which *does* commit, and then
> I use `--amend` or `rebase` to perform adjustments.  Git supports that
> particularly well.

Yes, we can already do all of this without “click[ing] around” on a web
page. It’s quite easy to fetch the commits that the merge request is
referring to and then use Git locally to add more commits, amend the
existing commits, etc.

I recommend using Magit to do this without even leaving Emacs.

Incidentally, GitHub makes it even easier to do this because they add a
ref for every merge request.

db48x