Replying to Avatar Enki

Yeah. Specifically, I wanted to update my lnbits instance and when I did a git pull, it said it failed to merge because there was a bunch of changes. When I know for a fact, I haven't touched any of these files It's claiming have merge conflicts.
Avatar
Nick Klockenga 2y ago

I believe LNBits maybe did some force pushes onto the main/master branch semi-recently that removed past commits. Possible your local branch had merge conflicts with the remote changes. I can’t remember when/where I heard that info about LNBits repo. I also don’t remember off hand how to do a git pull and overwrite the entire local branch.

Reply to this note

Please Login to reply.

Discussion

Avatar
Enki 2y ago

Ok thanks ill see if i can Figure out how to do that. Thanks for pushing me in the correct direction.

Avatar
Nick Klockenga 2y ago

Found it

Avatar
Enki 2y ago

Baller that fixed it for me. Much thanks!

Avatar
Enki 2y ago

I tried zapping you for the help but your Lnurl seems to be down.

Avatar
Nick Klockenga 2y ago

Thanks for letting me know. Should be fixed now. I accidentally updated the wrong ln address today. because Primal changed it to a custodial address without asking... So annoying when Nostr clients update your profile info (like ln address) without asking.

Avatar
Enki 2y ago

Lmao yup.