Conflicts Exist message when committing changes to version control

I'm trying to commit changes to a driver into version control. I got a
message saying "Conflicts Exist - Your project contains one or more
files that are in a conflicted state...... All conflicts must be
resolved before you can check in to the version control server"

I clicked OK, then did Compare Revisions on the driver, and it's telling
me No differences. My guess is that the driver checkin actually did
complete but there's something else that's conflicting. The message is
too vague for me to figure out what, so I'm hoping there's some way to
pinpoint what is conflicting.

Any help much appreciated.

Tags:

  • de Groot, David wrote:

    > Any help much appreciated.


    Use version control view to commit individual parts o fthe project to narrow
    down the part that is causing the conflict. This also makes sure that the part
    of your uncommited work that is not in conflict get's pushed to the server
    already. Once you have everything commited except the conflict, you have
    basically three choices (none really satisfying, unfortunately):

    a) save your remaining uncommited changes externally (export to file or deploy
    to live system), revert the project, import changes, commit.
    b) Install a svn 1.5 client locally and carefully (!) examine the working copy
    for the exact conflicting files. You may or may not be able to solve the
    conflict manually without breaking stuff. Take a backup first (close Designer,
    backup the whole workspace. Do not use Designer's export project feature, that
    will not include the SVN meta data to allow a complete rollback). Do not use a
    current svn client, it will try to convert the project into a newer working
    copy format that Designer cannot work with.
    c) open a service request and let MicroFocus/NetIQ do the dirty work.

    Good luck!

    Lothar
  • On 8/11/2015 4:28 AM, Lothar Haeger wrote:
    > de Groot, David wrote:
    >
    >> Any help much appreciated.

    >
    > Use version control view to commit individual parts o fthe project to narrow
    > down the part that is causing the conflict. This also makes sure that the part
    > of your uncommited work that is not in conflict get's pushed to the server
    > already. Once you have everything commited except the conflict, you have
    > basically three choices (none really satisfying, unfortunately):
    >
    > a) save your remaining uncommited changes externally (export to file or deploy
    > to live system), revert the project, import changes, commit.
    > b) Install a svn 1.5 client locally and carefully (!) examine the working copy
    > for the exact conflicting files. You may or may not be able to solve the
    > conflict manually without breaking stuff. Take a backup first (close Designer,
    > backup the whole workspace. Do not use Designer's export project feature, that
    > will not include the SVN meta data to allow a complete rollback). Do not use a
    > current svn client, it will try to convert the project into a newer working
    > copy format that Designer cannot work with.
    > c) open a service request and let MicroFocus/NetIQ do the dirty work.
    >
    > Good luck!
    >
    > Lothar
    >

    Thanks Lothar
    I'm only working on one driver, so I tried a, that brought down a
    version of the driver that had only minimal configuration, definitely
    not the one I checked in (even though a previous Compare had said they
    were equal). I am able to continue development, will probably need some
    time to figure out the version control issues.
  • de Groot, David wrote:

    > probably need some time to figure out the version control issues.


    That's something engineering at Microfocus/NetIQ should rather do, the SVN part
    of Designer really deserves to be fixed and updated (or better: completely
    replaced by a git plugin).

    Some general rules to minimize problems:

    1. always check in and out the whole project, avoid working with SVN on smaller
    parts unless absolutely necessary
    2. always update before any commit if more than a single working copy exists
    (multi-user or multi-Designer env)
    3. check in frequently, whenever a state is reached you might want/need get
    back to
    4. use the comment field when checking in (have to work on this one harder
    myself :-)
    5. if you run into conflict, solve them immediately before continuing with
    further development. It get's harder to solve and you risk loosing more stuff
    the longer you wait.
    6. if problems occur over and over again, copy the project in Designer (under a
    new name, without SVN meta info) as a backup and check out a fresh working copy
    from the SVN server. Now you can copy/paste anything not yet commited in again
    and hopefully continue without issues.

    Cheers, Lothar