[Jmri-developers] Cannot build after a merge from master

[Cressman <pgc...@sb...>]

Before submitting a pull request I did a merge into the branch while I had the version of PanelPro running.  Yes, a mistake I didn't notice.  The merge failed and so I repeated it with another merge that reports everything up to date.  However, after these merges from git master I get these compile errors for a clean build:       [javac] C:\Git\JMRI\java\src\jmri\web\servlet\panel\ControlPanelServlet.java:66: error: cannot find symbol
       [javac]                         panel.addContent(positionableElement(sub));
       [javac]                                          ^
       [javac]   symbol:   method positionableElement(Positionable)
       [javac]   location: class ControlPanelServlet
       [javac] C:\Git\JMRI\java\src\jmri\web\servlet\panel\LayoutPanelServlet.java:80: error: cannot find symbol
       [javac]                         panel.addContent(positionableElement(sub));
       [javac]                                          ^
       [javac]   symbol:   method positionableElement(Positionable)
       [javac]   location: class LayoutPanelServlet

Hoping that whatever corrupted the branch would not be pushed to Git, I committed, pushed and requested a pull.  The same compile errors occur on Git hub.  Locally, I copied in 2 files from my local master that resolve the missing positionableElement() method.  However, this then leads to other compile errors for references these replacements need. I hesitate to continue overwriting files from my local master.  BTW merging to my local master was successful and clean builds can be done.

Using the "Replace with Head Reversion" of Eclipse does not fix the problem.  I don't understand the 'git rebase' or 'git revert' commands well enough to use them.  I'd like some advice before I screw up the branch even further.  I need to undo the merge on my local branch, not the commit on my fork at git hub  (although that would be OKto do).  The important thing is not to lose all the work I did locally before the merge to the branch.
Any advice would be most welcome.PeteC