Awiteb on Nostr: I use `git merge something || git status -s && git merge --abort` and if there is a ...
I use `git merge something || git status -s && git merge --abort` and if there is a conflicts I mention the conflicts to the patch author and ask for another version of the patch. If there is no conflicts the patch will be merged
Published at
2025-02-06 06:00:37Event JSON
{
"id": "2b7ef4af947d2d4aed47683cb9a1a7bb308eb140f806ac319c825e5a4911ca93",
"pubkey": "00000001505e7e48927046e9bbaa728b1f3b511227e2200c578d6e6bb0c77eb9",
"created_at": 1738821637,
"kind": 1,
"tags": [
[
"e",
"cb588fb0f5633c438a71826403a29014f2b9d65056423611c4dcbb2f14cfb7f7",
"wss://ditto.pub/relay",
"root",
"9774fa73d93e8079d02b61097a0aae23f9890f35ef99040aec95d0def2f24e27"
],
[
"p",
"9774fa73d93e8079d02b61097a0aae23f9890f35ef99040aec95d0def2f24e27"
],
[
"client",
"snort",
"31990:84de35e2584d2b144aae823c9ed0b0f3deda09648530b93d1a2a146d1dea9864:app-profile"
]
],
"content": "I use `git merge something || git status -s \u0026\u0026 git merge --abort` and if there is a conflicts I mention the conflicts to the patch author and ask for another version of the patch. If there is no conflicts the patch will be merged",
"sig": "4ff4529cb4b7cf6f2a5c85cf88ed976caad81900589f2b4b7c2151e4f9058f755979d852ffe915edc004ba67800f66e3120e23750a56ecd13bb6b0264f4cda56"
}
