I’ve been working with branches for a bit. Its been working well but recently I have hit a wall with one of my files. Everytime I try to merge, it shows me that I have conflicts
I try to resolve them all by keeping everything in my branch. It moves to the next screen but doesn’t let me apply any changes as the button is disabled
and eventually runs out of memory
Not sure what the solution is here. Please help!