I have some local files, I pull from remote branch and there are conflicts. I know that I would like to keep my local changes and ignore the remote changes causing conflicts. Is there a command I can use to in effect say “mark all conflicts as resolved, use local”?

2 Answers
2

Leave a Reply

Your email address will not be published. Required fields are marked *