I think I've found a somewhat painless way to deal with merge conlicts.
Assuming it's the stupid log files, open up Git Bash, navigate to your repo then type "git add *FILE AND FILE DIRECTORY HERE". They can be completely overwritten since there's no code in them.
It's almost the same for other files, just add/delete whatever lines need to be in the newest version.
Fiddling with that in the GUI was going nowhere since it seemed I could never stage them.
Looking at examples was crap since they just said "Change the differences, derp". The key part is the "git add" command.
Hope this helps.
I think I've found a somewhat painless way to deal with merge conlicts.
Assuming it's the stupid log files, open up Git Bash, navigate to your repo then type "git add *FILE AND FILE DIRECTORY HERE". They can be completely overwritten since there's no code in them.
It's almost the same for other files, just add/delete whatever lines need to be in the newest version.
Fiddling with that in the GUI was going nowhere since it seemed I could never stage them.
Looking at examples was crap since they just said "Change the differences, derp". The key part is the "git add" command. Hope this helps.