Automatically resolve conflict at specific lines using find/replace

Question

There was some kind of misunderstanding which resulted in conflict in 100+ files. The conflict is very easy to resolve though. One set of files has:

// In .h files
virtual bool exec();
// in cpp files:
bool SomeClassName::exec() {

And the other set has:

// In .h files
virtual bool work();
// in cpp files:
bool SomeClassName::work() {

I would like to resolve this automatically. Doing it manually would take two hours or more. How can I find and replace work() to exec()? Apart from git, I also can use SourceTree and BeyondCompare if it can help my situation.

Note that additional conflict may need manual resolution after this is resolved, so the files must not be automatically marked as resolved.

and you want to resolve them like...? – max630 Aug 28 '17 at 20:25 — max630, Aug 28 '17 at 20:25

max630 · Answer 1 · 2017-08-29T03:39:48.270

0

Sometimes it makes sense to make some changes before actual merge. For example, in this case the method rename could be done before by IDE's "refactoring" functionality.

If merging is already in progress, it can be aborted by git merge --abort (make sure you have saved resolved files), it will reset repository to the version before merging.

edited Aug 29 '17 at 03:39

answered Aug 28 '17 at 20:27

max630

8,762
3
30
55

Please use comments to ask for details. And no, unfortunately I was in about 20% of merging process already, so using IDE for mass renaming wouldn't work. – Tomáš Zato Aug 28 '17 at 20:29

Automatically resolve conflict at specific lines using find/replace

1 Answers1