Vlastimil Babka on Nostr: Days since I messed up a conflict resolution during git rebase by using "git commit ...
Days since I messed up a conflict resolution during git rebase by using "git commit --amend" instead of "git rebase --continue", which squashes the fixed up commit into the previous one: 0
Sigh, does anyone have some trick that detects this situation and fails the --amend? :))
Published at
2024-07-15 07:42:44Event JSON
{
"id": "0cb62f4827b3a99b528b1747130ad5db364eb86e8636a1b15dab47f0e1ce359a",
"pubkey": "07ae8c04196b8ba41003d24b86c90a1e84e37134f595150b38dc3605c6cca608",
"created_at": 1721029364,
"kind": 1,
"tags": [
[
"proxy",
"https://social.kernel.org/objects/1cf0decd-62a2-4a5a-a6a6-56f578db20e9",
"activitypub"
]
],
"content": "Days since I messed up a conflict resolution during git rebase by using \"git commit --amend\" instead of \"git rebase --continue\", which squashes the fixed up commit into the previous one: 0\n\nSigh, does anyone have some trick that detects this situation and fails the --amend? :))",
"sig": "45b04bc2e389d9f062ebc4fb409faa3dccde4f90cdfe0061ef5297f40a627837952f11c1f6fd16d5a85e2385eec5e852f7f2bb45ef1177d4a08ef23ef228633a"
}
