| Chunk |
|---|
| Conflicting content |
|---|
import org.zanata.model.HProject; import org.zanata.model.HProjectIteration; import org.zanata.ui.CopyAction; <<<<<<< HEAD import org.zanata.util.FacesNavigationUtil; ======= import org.zanata.ui.faces.FacesMessages; >>>>>>> cbf0ee4d8a5c8ff27215847eca3e266ec101a825 /** * Handles user interaction from merge_trans_modal.xhtml. |
| Solution content |
|---|
import org.zanata.model.HProject; import org.zanata.model.HProjectIteration; import org.zanata.ui.CopyAction; import org.zanata.util.FacesNavigationUtil; import org.zanata.ui.faces.FacesMessages; /** * Handles user interaction from merge_trans_modal.xhtml. |
| File |
|---|
| MergeTransAction.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
return;
}
mergeTranslationsManager.start(sourceProjectSlug,
<<<<<<< HEAD
sourceVersionSlug, targetProjectSlug, targetVersionSlug,
!keepExistingTranslation);
FacesNavigationUtil.handlePageNavigation(null, "merge-translation");
=======
sourceVersionSlug, targetProjectSlug, targetVersionSlug,
!keepExistingTranslation);
>>>>>>> cbf0ee4d8a5c8ff27215847eca3e266ec101a825
}
// Check if copy-trans, copy version or merge-trans is running for the |
| Solution content |
|---|
return;
}
mergeTranslationsManager.start(sourceProjectSlug,
sourceVersionSlug, targetProjectSlug, targetVersionSlug,
!keepExistingTranslation);
FacesNavigationUtil.handlePageNavigation(null, "merge-translation");
}
// Check if copy-trans, copy version or merge-trans is running for the |
| File |
|---|
| MergeTransAction.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |