Refactoring quality model loading

nmsa / tma-framework-a

Component A - Trustworthiness Monitoring & Assessment Framework

Apache License 2.0

1 stars 3 forks source link

Refactoring quality model loading #78

Closed jreluiz closed 5 years ago

jreluiz commented 5 years ago

Using the quality model persisted in the database.

brenofranca83 commented 5 years ago

@jreluiz there are several conflicts on your merge. please solve them before PR.

jreluiz commented 5 years ago

@brenofranca83 I can not merge because I am not allowed to do commits on the master. I think the idea, for what Nuno said, is that whoever is allowed to do commits in the master makes the merge.

brenofranca83 commented 5 years ago

@jreluiz , I'm aware of the commit flow. But you need to solve the conflicts BEFORE the merge/PR. We've already discussed it. You should be sure your request has no conflicts when opening a PR. Please, sync your local master with the remote and try to merge it locally. You'll be able to see and fix the conflicts.