In Git, is there a way to automatically mark all new versions of files in a merge conflict as correct?

Question

So, I encountered a merge conflict with my repo, for older versions only ~ 1 month, is there a simple command to mark all newer versions as correct, and not do it for each individual file (I work with ~ 1000 files)

thanks

Answer 1

As described in the Git merge team, a recursive strategy accepts, among others, ours and their options. Both options resolve conflicts by overwriting existing or incoming versions, respectively.

I don’t know which version is newer in your case, so I can’t specify exactly which of the two parameters you should specify, but I think you will understand this.

Note. As @Mark Longair noted, our strategy also exists, but has a different effect than our option for a recursive strategy. Be careful not to confuse them.