xpages errors after git merge

Question

I'm working on an XPages project together with one other developer and we are using IBM Domino Designer 9.0. For source control we are using Git, Bitbucket and SourceTree. I created a branch (branched off from Develop) to work with. When I was finish I switched to Develop, pulled from it's remote counterpart to get the other developer's changes. Then I merged my branch into develop - no merge conflicts occurred. But when I'm opening the project in Designer i get lots of errors. E.g. when trying to open an XPage to work with I get this error:

Could not open the editor: Could not parse the .xsp-config file named CustomControls/entrySelector.xsp-config in the project C:\Program Files\IBM\Notes\Data\workspace\DS8_2fD-D\customer_5cdtu_5ctrip.nsf

I have tried to delete the project and create a new one from the ODP but it doesn't work. Also the errors are changing. Sometimes it is able to open the XPage in Designer, but then it says that the Custom Control Tag isn't valid or something like that. Maybe it's worth mentioning that the files I'm working with has nothing what so ever to do with the entrySelector.xsp custom control file.

---

The problem just happened again. I was working on a feature branch and wanted to merge some changes from develop into that feature branch. I did the following:

Save and Clean/Build project
Sync with ODP
Stage all files: SomeBean.java
SomeBean.java.metadata
editSomething.xsp
viewSomething.xsp
+ 4 similar classes with other names
Commit all staged files
Checkout develop (switch from feature branch to develop)
Pull from origin/develop to develop
Checkout feature branch
Merge (from log) picked the latest commit from develop
ODP Refresh
Project.nsf sync with ODP
Clean and Build Project
BAAAM 9 Errors (the unknown tag xc:editSomething cannot be used as a control)

Maybe it's worth mentioning that none of the files above was new/untracked. They were also present in the develop branch. When I try to open the editSomething.xsp I now get this error message: Could not open the editor: An unexpected exception was thrown

This problem has kinda become somewhat of a daily struggle and it pisses me off as I don't know what I'm doing wrong.

Answer 1

To address this go into Package Explorer and right-click a blank area and select refresh. Then in source tree, see if there are any uncommitted changes. If there are I bet they're xsp-config files. Select them, right click and select discard.

If that doesn't work, still check your uncommitted changes and discard them (if you haven't made any changes). In Designer, right-click your nsf and select Team Development\Associate with existing on disk project (or something to that effect). Select the proper on disk project and select the import option.

If none of that works, find the offending xsp-config files and copy/paste from the SCM web site. While not elegant it will get you around this very frustrating issue.

While this is kind-of a convoluted process I've found that one of the above processes will usually fix the issue.

EDIT: I wanted to post this yesterday but I couldn't find the setting I was looking for. But in DDE Preferences, navigate to General\Workspace and check "Refresh Automatically". This setting has stopped this issue from happening for us but your mileage may vary.

Answer 2

We have seen this issue a couple of times. Not quite sure why. We are investigating it yet to see if we can re-create it.

However, we have found a way to get back on track with the code. First we tried to create a new NSF based on the ODP. That worked. So then we re-associated the original NSF with the ODP - and that brought it back to a state where we could edit the design elements again ;-)

/John