You must log in or register to comment.
Taking the time to learn how git works on a conceptual level and then how to resolve merge conflicts effectively is a worthwhile investment. Highly recommended
I just stash everything and manually copy-paste all the relevant changes, I'm salaried so I don't care about wasting time
