Replying to Avatar DanConwayDev

if 01010202 is in the ancestory of 11112222 then it `git push` will work fine. if it is not, `git push --force` must be used to purposefully overwrite and potentially lose someone else's change. this is standard git.

The git remote helper also check each git server listed to ensure it is not overwriting any ones changes pushed directly to each server as sometimes the state of the git server might differ from the nostr state event.
Avatar
DanConwayDev 1y ago

In fact, if one of the git server(s) is ahead of the git state with conflicting changes, the user maintainer needs to push directly to that git server to overwrite the changes before they can proceed to get everything back in sync by pushing to the nostr remote.

All of this will only happen on the rare occasion that conflicting changes are pushed at about the same time or if some maintainers stop using the nostr remote as the default one.

Reply to this note

Please Login to reply.

Discussion

No replies yet.