We have support for manual merges. The detection is still not perfect, but works in most cases, and you can always provide the commit id that merged a PR instead of pressing the merge button if it failed for some reason.
The option is "Enable autodetect manual merge (Note: In some special cases, misjudgments can occur)" in the Pull requests repo settings.
daniel:// stenberg:// (npub1cm0…enqe)
Codeberg.org /
npub1fh…3ee83
2024-06-12 21:46:22
in reply to nevent1q…gn50
Author Public Key
npub1fh736ae0xzk98s59wggazdpqg0g78mg2rwk7qf87ew96cqhc4lrst3ee83Published at
2024-06-12 21:46:22Event JSON
{
"id": "9efda00fe95ca385d171cedf5214206b9fd345cc313a19105cbc08cac322d06c",
"pubkey": "4dfd1d772f30ac53c2857211d1342043d1e3ed0a1bade024fecb8bac02f8afc7",
"created_at": 1718228782,
"kind": 1,
"tags": [
[
"proxy",
"https://social.anoxinon.de/@Codeberg/112605841469992798",
"web"
],
[
"p",
"4dfd1d772f30ac53c2857211d1342043d1e3ed0a1bade024fecb8bac02f8afc7"
],
[
"e",
"215e910c61d973de8b40ac0a55e5048a00ee21ba2c6d5cb0e8b58a8a651287b3",
"",
"reply"
],
[
"p",
"feabbbecc74c7b9be424e20201ddf1dab07d2196047a49d812639ebefa929e67"
],
[
"p",
"c6ded81787e5543f1b20f09d744b089443524d9e6fe4a95aaeb4c07b42e012cb"
],
[
"e",
"57ade4fe04611bcdcac73beeb08b91349ff9ad2f0d3b9c914348fd8d7d0296c2",
"",
"root"
],
[
"proxy",
"https://social.anoxinon.de/users/Codeberg/statuses/112605841469992798",
"activitypub"
],
[
"L",
"pink.momostr"
],
[
"l",
"pink.momostr.activitypub:https://social.anoxinon.de/users/Codeberg/statuses/112605841469992798",
"pink.momostr"
]
],
"content": "We have support for manual merges. The detection is still not perfect, but works in most cases, and you can always provide the commit id that merged a PR instead of pressing the merge button if it failed for some reason.\n\nThe option is \"Enable autodetect manual merge (Note: In some special cases, misjudgments can occur)\" in the Pull requests repo settings.\nnostr:npub1cm0ds9u8u42r7xeq7zwhgjcgj3p4ynv7dlj2jk4wknq8kshqzt9smpenqe",
"sig": "b56a8f4fb8c90446bb0cd585ac822dcd5e14b5c32104a7c95fa256aa55414aa95af4c17c080efd736cb518f576e6fff880e6b97297b99133ea2266ef84bcc2af"
}