Databases
StackOverflow2013
Postsdbo
POxpages errors after git merge
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POxpages errors after git merge
    text
    copied!<p>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:</p> <p>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</p> <p>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.</p> <hr> <p>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:</p> <p>Save and Clean/Build project<br/> Sync with ODP<br/> Stage all files: SomeBean.java<br/> SomeBean.java.metadata<br/> editSomething.xsp<br/> viewSomething.xsp<br/> + 4 similar classes with other names<br/> Commit all staged files<br/> Checkout develop (switch from feature branch to develop)<br/> Pull from origin/develop to develop<br/> Checkout feature branch<br/> Merge (from log) picked the latest commit from develop<br/> ODP Refresh<br/> Project.nsf sync with ODP<br/> Clean and Build Project<br/> BAAAM 9 Errors (the unknown tag xc:editSomething cannot be used as a control)</p> <p>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</p> <p>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.</p>
 

Querying!

 
Guidance
An individual column

Larger individual text columns get their own page to allow for proper reading.

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload