git - TortoiseGit: Mark as merged multiple files -

i have conflict head , need merge 100s of files. merge files in bulk. know want in head (not have).

i select checkboxes , right click , "resolve conflict using theirs". 1 file resolved.

this means need 1 file @ time (100s of times).

is there better way, because can think of 273 better things time.

this straightforward git bash:

git checkout --theirs src/pages/* git add src/pages/* git commit -m 'merged , resolve conflict' 

if have conflicted files in other paths, can use similar command. screen capture, method might work you, conflicted files seem grouped in common root folder.

i give credit this great answer discusses similar problem yours.