Code review comment for lp:~jimbox-comcast/mvhub/remove_additional_seq

Revision history for this message
Saroun Sek (saroun-sek) wrote :

> There are conflict markers in the diff against trunk for this merge request.
>
> Those should be resolved.
>
>
> Merging trunk into the the branch and resolve conflicts before pushing branch
> again
>
>
> SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS should not be removed. Once you merge
> trunk and priya's schema updates, the test will pass for this.

SYNONYM_STEM_X_CONCAT_SUBMITTED_WORDS gets a conflict with my branch. I chose SYNONYM_STEM_X_SUBMITTED_WORDS as the name, which caused a conflict. I don't think he'll need to add it back in since when he merges with mine, it will give a conflict both ways.

« Back to merge proposal