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
DiceRolls 2y ago

This thread is text book value for value.......love to see it 👏

nostr:nevent1qqst8a2ljdqy7fhgyfzysuntms3tnpl42zt4wqsgt7ms8s37w5z4gdgpp4mhxue69uhkummn9ekx7mqzypzdc8pdh8plh4a7ayjhan44903ulrzqhtmmv06xu4443gf3ca8skqcyqqqqqqgx3c4p2

Reply to this note

Please Login to reply.

Discussion

No replies yet.