search

revaturelabs / caliber-2-meta

Meta Repository for Caliber 2
5 stars 1 forks source link

Merge Conflicts in QA Service #22

Closed Quinn-Donnelly closed 5 years ago

Quinn-Donnelly commented 5 years ago

The quality audit service has a merge conflict marker in the pom.xml

See Merge Conflict Here

Quinn-Donnelly commented 5 years ago

@revaturelabs/1901-jan14-p3 if we could get this resolved quickly as it is currently breaking the builds on dev.

peytonshriver commented 5 years ago

I combed through and the merge conflict should be resolved.

On Fri, Apr 19, 2019 at 9:24 AM Quintin Donnelly notifications@github.com wrote:

@revaturelabs/1901-jan14-p3 https://github.com/orgs/revaturelabs/teams/1901-jan14-p3 if we could get this resolved quickly as it is currently breaking the builds on dev.

— You are receiving this because you are on a team that was mentioned. Reply to this email directly, view it on GitHub https://github.com/revaturelabs/caliber-2-meta/issues/22#issuecomment-484895121, or mute the thread https://github.com/notifications/unsubscribe-auth/AHRVA2OKWQ2BEE6JLYTZNH3PRHBYDANCNFSM4HHECSEQ .

Quinn-Donnelly commented 5 years ago

@peytonshriver Looks like the merge conflicts have been resolved but there is an unknown type EvaluationService in the NoteService class.

peytonshriver commented 5 years ago

Ill investigate, and try to resolve where it is supposed to come from.

On Fri, Apr 19, 2019 at 9:43 AM Quintin Donnelly notifications@github.com wrote:

@peytonshriver https://github.com/peytonshriver Looks like the merge conflicts have been resolved but there is an unknown type EvaluationService in the NoteService class.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/revaturelabs/caliber-2-meta/issues/22#issuecomment-484900035, or mute the thread https://github.com/notifications/unsubscribe-auth/AHRVA2IPXHMG5ZNNNSCAF4TPRHD6PANCNFSM4HHECSEQ .

Quinn-Donnelly commented 5 years ago

@peytonshriver The most recent change introduced to dev seems to have resolved the issue.

peytonshriver commented 5 years ago

That should be resolved now. There was a missing import statement.

On Fri, Apr 19, 2019 at 9:50 AM Peyton RS peyton.shriver@gmail.com wrote:

Ill investigate, and try to resolve where it is supposed to come from.

On Fri, Apr 19, 2019 at 9:43 AM Quintin Donnelly notifications@github.com wrote:

@peytonshriver https://github.com/peytonshriver Looks like the merge conflicts have been resolved but there is an unknown type EvaluationService in the NoteService class.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/revaturelabs/caliber-2-meta/issues/22#issuecomment-484900035, or mute the thread https://github.com/notifications/unsubscribe-auth/AHRVA2IPXHMG5ZNNNSCAF4TPRHD6PANCNFSM4HHECSEQ .