-
Notifications
You must be signed in to change notification settings - Fork 174
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[conflict_resolver] api + dataframework (version 3) #7558
Conversation
Hi @xlecours when I visit the conflict_resolver module while on the unresolved pane and try to set the correct answer. I'm having an error caused by $this->table being null for the following code:
located at Loris/php/libraries/NDB_BBVL_Instrument.class.inc at line # 829
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @xlecours, please see my comment. I did make clean && make dev on your branch with tools/raisinbread_refresh.php and I did check to see that your mysql patch was applied.
what is the instrument that you're using to try and resolve a conflict on? |
thanks @driusan that's probably my issue. |
@maltheism Did you had the chance to review this with another instrument? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything looks great!
I tried to merge this but there's a conflict with |
Brief summary of changes
Previous versions:
#6862
#5140
This will conflict with #7535