You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@netbeans.apache.org by "Leo Donahue (JIRA)" <ji...@apache.org> on 2018/03/29 05:21:00 UTC

[jira] [Created] (NETBEANS-546) Resolve Conflict

Leo Donahue created NETBEANS-546:
------------------------------------

             Summary: Resolve Conflict
                 Key: NETBEANS-546
                 URL: https://issues.apache.org/jira/browse/NETBEANS-546
             Project: NetBeans
          Issue Type: Bug
          Components: versioncontrol - Subversion
    Affects Versions: 9.0
         Environment: Debian 4.9.82-1+deb9u3 (2018-03-02) x86_64 GNU/Linux
NetBeans-dev-incubator-netbeans-linux-378-on-20180326-basic
            Reporter: Leo Donahue


In the NetCAT 9.0 BETA test for section "Standard development of project", step number 9 "Resolve conflict".

When Unresolved conflicts says "0" conflicts and we click OK, the "Main.java" file has a red exclamation icon indicating that there is an Error parsing file.

The Main.java source file has the following lines where we made changes.

||||||| .r16



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists