Tony on Nostr: Rebases. It applies my changes on top of the latest changes for amethyst. So as long ...
Rebases. It applies my changes on top of the latest changes for amethyst. So as long as we dont both touch the same code it's seamless and takes 1 minute. Otherwise I do a little bit of merge conflict resolution but that should just be a few minutes of work and it's pretty minor what I've changed. Mostly deleting code.
Published at
2023-06-09 15:43:19Event JSON
{
"id": "6b39d330fac942638227a28d5aec97cc592ae40ac6b572c0899b4e63087f03e4",
"pubkey": "5be6446aa8a31c11b3b453bf8dafc9b346ff328d1fa11a0fa02a1e6461f6a9b1",
"created_at": 1686325399,
"kind": 1,
"tags": [
[
"e",
"7a0a419d27abf4e6e7d0aa5a801b90952e8e0c09b8e8a0dc11068b759451e407"
],
[
"e",
"5b9b76169be78bb4a19ad0acbaf4fc86dd208b75fa2cc1dd8be57dfcb2de2dc0"
],
[
"p",
"5be6446aa8a31c11b3b453bf8dafc9b346ff328d1fa11a0fa02a1e6461f6a9b1"
],
[
"p",
"577de06dce160a0379163a4bb7b680be3e0a0e1c68de6e6ba8c01134b44064dd"
]
],
"content": "Rebases. It applies my changes on top of the latest changes for amethyst. So as long as we dont both touch the same code it's seamless and takes 1 minute. Otherwise I do a little bit of merge conflict resolution but that should just be a few minutes of work and it's pretty minor what I've changed. Mostly deleting code. ",
"sig": "b1e3af78b2f9639c126df3d5efcafe05151365ade7fb625ee5a1b7ed9e2e10ae9e8199c5bbec595b208b3b990699360dde7df03f443c74a105b9fd9b4c44ba82"
}
