import { useTranslation, Trans } from 'react-i18next' import getMeta from '@/utils/meta' import { OLModalBody, OLModalFooter, } from '@/shared/components/ol/ol-modal' import OLButton from '@/shared/components/ol/ol-button' import Notification from '@/shared/components/notification' import { ProjectSyncState, GitSyncModalStatus } from '../../types/git-sync-types' type GitSyncConflictModalProps = { projectSyncState: ProjectSyncState handleHide: () => void setModalStatus: (modalStatus: GitSyncModalStatus) => void } const GitSyncConflictModal = ({ projectSyncState, handleHide, setModalStatus }: GitSyncConflictModalProps) => { const { t } = useTranslation() const { appName } = getMeta('ol-ExposedSettings') return ( <>

]} />

{t('close')} setModalStatus('run-merge-resolved') } > {t('continue_github_merge')} ) } export default GitSyncConflictModal