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

Go to solution
lss123
Tera Contributor

‎11-15-2016 10:39 AM

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?

0 Helpfuls
  • 1,370 Views
1 ACCEPTED SOLUTION

Go to solution
Kalaiarasan Pus
Giga Sage
In response to lss123

‎11-15-2016 11:10 AM

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.


View solution in original post

0 Helpfuls
10 REPLIES 10

Go to solution
lss123
Tera Contributor
In response to mofostraub

‎11-16-2016 05:28 AM

Thanks.   As I'm going through my conflicts, I'm finding that these files were modified for good reason.   It seems fruitless, when looking at, say 1,000 conflicts, to try to merge in the upgrade code with my modified code.   How much merging did you actually end up doing?


0 Helpfuls