patricklodder on Nostr: error: Your local changes to the following files would be overwritten by merge: ...
error: Your local changes to the following files would be overwritten by merge:
file/name/path
some/more/filenamepath
Please, commit your changes or stash them before you can merge.
Aborting
Published at
2023-09-19 21:12:54Event JSON
{
"id": "521747976a794eafb9a25f5fc13d4a0cc1e73cc1e9994d092b6550540a3fe999",
"pubkey": "9c7a06811220f12a91bbacbaaa1149d0ebe90384215a241c2403de544912f1d9",
"created_at": 1695157974,
"kind": 1,
"tags": [
[
"e",
"44317456e33f250826df4f89e15caeab4fdabcd622fd6efbb608c73baf0681af",
"wss://relay.damus.io",
"root"
],
[
"p",
"82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2"
]
],
"content": "error: Your local changes to the following files would be overwritten by merge:\nfile/name/path\nsome/more/filenamepath\nPlease, commit your changes or stash them before you can merge.\nAborting",
"sig": "ff6c14a7bab68ae8edf4ad8f4a6cac3783092e4acb044925ceeef273589a28ae19a48357cbd2837b7799cb37003237d6615fbb59507926bce31adbb59a6c3f00"
}