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”?
![](https://itnursery.com/wp-content/uploads/2022/05/apple-touch-icon@2.png)