Skip to Content

Resolve conflict in WD project (DTR)

Hi All,

I've a local Web Dynpro project in the DTR (not DC).

I want to get back to a previous version of one of the files.

Steps I've done:

1) Right click on file name -> Show in -> Version Graph

2) Right click on old activity -> Sync to this version

At this point the file is downloaded to my local machine and I can use it. Also, I've a yellow exclamation mark next to the file in the DTR (meaning a version conflict since the file in my local machine and the file in the DTR are not the same)

Now I want to sync the file <b>from the client to the DTR</b> but the 'Resolve Conflict' isn't active (see picture)

http://img155.imageshack.us/img155/8797/dtrya3.jpg

How do I make it active?

Thanks,

Omri

Add comment
10|10000 characters needed characters exceeded

  • Follow
  • Get RSS Feed

2 Answers

  • avatar image
    Former Member
    Aug 17, 2006 at 09:22 AM

    Hi,

    I remember working with DTR/JDI was quite buggy. Sometimes reloading my project from disk or restarting NWDS would resolve conflicts.

    Try the JDI forum as well, since DTR is part of JDI.

    Good luck!

    Roelof

    Add comment
    10|10000 characters needed characters exceeded

  • avatar image
    Former Member
    Aug 17, 2006 at 09:29 AM

    Omri,

    If I understood correctly, you want to sync a file to its old version, do some changes (editing) and put back the correct version (edited files) back to your DTR.

    If that is the case, simply get back to your older version (by following the steps you've already mentioned in this thread). Then check out all the suitble files under an activity and make the required changes.

    Then, check-in the activity. At this point of time, all the relevant conflicts will be shown in the DTR console. The files having conflicts will not get checked in unless you resolve it.

    So, now, you may right click the required file having the conflict (under the activity) and use the option that helps you to choose use local version (I don't remember the exact name of that option.;-)).That's all. Follow the same procedure to resolve all the conflicts.

    ~ Bala

    Add comment
    10|10000 characters needed characters exceeded

    • Former Member Omri Cohen

      Hi Omri,

      In that case, do this.

      1.) Sync to the <b>latest</b>.

      2.) Check out the required files.

      3.) Now, select the checked-out files and sync them to the required version.

      Then you may proceed as mentioned in my previous reply.(I didn't test this scenario as I don't have DTR right now. However, I think it should work.)

      ~ Bala.