After resolving conflicts on a lower environment, what is the proper way to bring the conflict resolutions to the next environment?

[lss123]

After I resolve all conflicts in the Dev environment, and I go to upgrade Test, all of those conflicts will be there.   Do my conflict resolutions in Dev get captured in an update set, that I'd move to Test?   In Test, do I need to manually review each conflict and change its status?

[Kalaiarasan Pus]

You can pick out the updateset from Test. This will remove all the updates that you ignored while applying the update set to Test.

But for other types of conflicts, you will still need to take of it.

[lss123]

I'm not sure I was clear in my question.   When you're applying an upgrade, say Fuji -> Geneva, and you resolve conflicts in the lower environment, what do you do to repeat the process in Test?   You apply the Geneva upgrade, but then what?   If the upgrade created 1000 conflicts, do I have to again manually resolve the 1000 conflicts in each environment?

[Kalaiarasan Pus · Accepted solution]

That is correct. It is a manual action for which I also looking for some workaround.

I know it's a pain, as for me the records that needs this manual action is around 600

I have already to capture the changes via an update set and apply it, but it doesn't work either.

[lss123]

Thanks.   So you can bring your fixes/merges with update sets, but as for updating the status of each skipped record - that's manual.   Is that correct?