Code merge in two NWDI tracks

[Former Member]

Hello experts,

We have 2 NWDI servers:

Production landscape - used for defect fixes in production code. This has development track - DEV1

Project landscape - used for developing new enhancements. This has development track - DEV2

Both had the same code when we went live into production.

Every week we Assemble the code in DEV1 track (which contains defect fixes) and manually copy the SCA files into DEV2 track and check it in. We do this so that the latest defect fixes are available in Project landscape (DEV2 track) as well.

This is especially a problem in the below scenario:

1. I complete an enhancement in Sample.java file in DEV2 track. So I checkin my changes and deploy it in QA Portal for testing.

2. In the meanwhile, another developer fixes a defect in Sample.java file in DEV1 track.

3. As part of weekly drop I mentioned earlier, the defect fix from DEV1 track comes and overwrites my enhancement code and I lose the enhancement that was earlier deployed to QA Portal for testing.

How do we make sure that the defect fixes we do in DEV1 track doesn't overwrite the enhancements we do in DEV2 track?

Thanks,

Ajay

[junwu · Accepted solution]

i don't think it will overwrite your stuff in dev2.

when you import sca from dev 1 to dev2, if there is collision. you have to manually fix it.

you can find the collision in "Integration conflicts" view of your NWDS.

you can merge the code there.

[Former Member · Accepted solution]

Hi Jun,

We tried this, and it will only show up in Integration conflicts view of DEV2 track in NWDS, if we have the Sample.java file checked out in DEV2 track.

But in our case, the code is already checked in as I mentioned earlier in point 1: "I complete an enhancement in Sample.java file in DEV2 track. So I checkin my changes and deploy it in QA Portal for testing."

Any way we can prevent this overwriting of code?

Thanks,

Ajay

[junwu · Accepted solution]

no, i don't think you get it.

as long as you changed the same file, it won't be overwritten without your intervention.

i haven't tested with two nwdi server, i have tested it with two track in same nwdi server.

it should be applicable.

[Former Member · Accepted solution]

Ajay,

Why are you using two NWDI servers? You can have separate tracks for different landscapes in the one NWDI system. This way you should be able to see conflicts.