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.
Is it because I forgot to "git stash" before a pull?
Stash is only needed if you have staged changes you want to apply on top of the remote branch changes.
Thread collapsed
Thread collapsed
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.
Ok thanks ill see if i can Figure out how to do that. Thanks for pushing me in the correct direction.
Found it 
Baller that fixed it for me. Much thanks!
I tried zapping you for the help but your Lnurl seems to be down.
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.
Thread collapsed
Thread collapsed
Thread collapsed
Thread collapsed
Thread collapsed
Thread collapsed
