Global Feed Post Login
Replying to Avatar Enki

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

Avatar
Big Barry Bitcoin 2y ago

Merge conflicts.

This happens if you have modified files and then try to pull the latest changes on top of the modified files.

Reply to this note

Please Login to reply.

Discussion

No replies yet.