How to merge PRs created by developers #207
Replies: 1 comment 1 reply
-
Hello José, With git-merge you never loose the contributor's commit signatures. It doesn't depend on the merge being a fast-forward or not. With git-rebase, git-cherry-pick, and git-amend where you re-write the commits, and therefore loosing all the related signatures. When merging a feature into the upstream branch, we should not use the When merging the upstream into a downstream branch, we should use the |
Beta Was this translation helpful? Give feedback.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
-
From: #38 (comment)
We were discussing the process of merging standard PRs for two reasons:
main
anddevelop
) and use only bot signatures when merging intomain
or other automatically managed branches.Thre draft process could be:
If there are new commis in the main branch:
Contributor has to rebase their branch (signing new commits with their GPGP keys).
Go back to the previous state and merge.
The commit is signed with the Nautilus bot GPG key and shown as partially verified.
With gitmerge --ff-only
we would not lose the contributor's commit signature if we did not use the bot signature. Right now we get partially verified commits because the commit changes because we sign it again with a different GPG key (and we change the committer).UPDATE:
With git
merge
we do not lose the contributor's commit signature.Beta Was this translation helpful? Give feedback.
All reactions