CODEWITHSUNDEEP
gittortoisegit
Oliver Watkins
Oliver Watkins

Reputation: 13509

TortoiseGit: Mark as merged multiple files

I have a conflict with the head and I need to merge 100s of files. I would like to merge all the files in bulk. I know I want what is in the head (not what I have).

I select all the checkboxes and right click and "Resolve Conflict Using Theirs". However only one file is resolved.

This basically means i need to do one file at a time (100s of times).

Is there a better way, because I can think of 273 better things to do with my time.

enter image description here

Upvotes: 1

Views: 194

Answers (2)

MrTux
MrTux

Reputation: 34003

This was a bug in TortoiseGit which was just fixed (fix is in 2.0.0).

As a temporary workaround using the command line, please see the answer of Tim Biegeleisen.

Upvotes: 1

Tim Biegeleisen
Tim Biegeleisen

Reputation: 521314

This is fairly straightforward to do from the Git bash:

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

If you have conflicted files in other paths, then you can use a similar command. From your screen capture, this method might work well for you, as your conflicted files seem to be grouped together in a common root folder.

I give credit to this great SO answer which discusses a similar problem to yours.

Upvotes: 2

Related Questions