I have a question for more experienced developers. Why does Git sometimes arbitrarily add HEAD >>>>>>>>>> into my files not allowing Meet a pull, a new version of LNbits, for instance.
Making it so I have to go into these files, delete the fucking head comments, save it, and then pray to God that I can fucking pull the nrw version again When I haven't touched any of these files, there's probably something that I'm missing, but I genuinely don't understand it.
I just wanted to update my version of LNbits and now I have to fix all this merge conflict shit.
#asknostr
You said you’re not making changes between pulls? If you are, you need to stash before you pull.
Please Login to reply.
The only thing I changed was an environment file.
When i do a reset to head, stash, and try to pull again it says i need to fix merge conflitcs.
