Uploaded image for project: 'NetBeans'
  1. NetBeans
  2. NETBEANS-546

Resolve Conflict

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Major
    • Resolution: Duplicate
    • 9.0
    • None
    • None
    • Debian 4.9.82-1+deb9u3 (2018-03-02) x86_64 GNU/Linux
      NetBeans-dev-incubator-netbeans-linux-378-on-20180326-basic

    Description

      In the NetCAT 9.0 BETA test for section "Standard development of project", step number 11 "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.

      several vertical bars to the left of .r16

      .r16

      Attachments

        Issue Links

          Activity

            People

              Unassigned Unassigned
              donahulf2 Leo Donahue
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: