fix: make commit sync use safe sync flow

Rename commit push action to Commit & sync
Use fetch and rebase before pushing committed changes
Keep sync result toasts consistent
This commit is contained in:
Bohdan Triapitsyn
2026-05-06 00:12:39 +03:00
parent 16c349417f
commit 8540f51395
7 changed files with 67 additions and 20 deletions
+3 -3
View File
@@ -424,9 +424,9 @@ export const dict = {
'gitView.commit.generate': 'Generate',
'gitView.commit.generateAria': 'Generate commit message',
'gitView.commit.messagePlaceholder': 'Commit message',
'gitView.commit.push': 'Push',
'gitView.commit.pushAria': 'Push',
'gitView.commit.pushing': 'Pushing...',
'gitView.commit.push': 'Commit & sync',
'gitView.commit.pushAria': 'Commit and sync',
'gitView.commit.pushing': 'Syncing...',
'gitView.commit.selectFilesHint': 'Select files in Changes to enable commit.',
'gitView.commit.title': 'Commit',
'gitView.common.cancel': 'Cancel',
+3 -3
View File
@@ -425,9 +425,9 @@ export const dict: Record<I18nKey, string> = {
"gitView.commit.generate": "Generar",
"gitView.commit.generateAria": "Generar mensaje de commit",
"gitView.commit.messagePlaceholder": "Mensaje de commit",
"gitView.commit.push": "Push",
"gitView.commit.pushAria": "Push",
"gitView.commit.pushing": "Enviando...",
"gitView.commit.push": "Commit & sync",
"gitView.commit.pushAria": "Commit and sync",
"gitView.commit.pushing": "Sincronizando...",
"gitView.commit.selectFilesHint": "Selecciona archivos en Cambios para habilitar el commit.",
"gitView.commit.title": "Commit",
"gitView.common.cancel": "Cancelar",
+3 -3
View File
@@ -425,9 +425,9 @@ export const dict: Record<I18nKey, string> = {
'gitView.commit.generate': '생성',
'gitView.commit.generateAria': '커밋 메시지 생성',
'gitView.commit.messagePlaceholder': '커밋 메시지',
'gitView.commit.push': '푸시',
'gitView.commit.pushAria': '푸시',
'gitView.commit.pushing': '푸시 중…',
'gitView.commit.push': 'Commit & sync',
'gitView.commit.pushAria': 'Commit and sync',
'gitView.commit.pushing': 'sync 중…',
'gitView.commit.selectFilesHint': '커밋하려면 변경 사항에서 파일을 선택하세요.',
'gitView.commit.title': '커밋',
'gitView.common.cancel': '취소',
+3 -3
View File
@@ -425,9 +425,9 @@ export const dict: Record<I18nKey, string> = {
"gitView.commit.generate": "Generar",
"gitView.commit.generateAria": "Generar mensagem de commit",
"gitView.commit.messagePlaceholder": "Mensagem de commit",
"gitView.commit.push": "Push",
"gitView.commit.pushAria": "Push",
"gitView.commit.pushing": "Enviando...",
"gitView.commit.push": "Commit & sync",
"gitView.commit.pushAria": "Commit and sync",
"gitView.commit.pushing": "Sincronizando...",
"gitView.commit.selectFilesHint": "Selecione arquivos em Alterações para habilitar o commit.",
"gitView.commit.title": "Commit",
"gitView.common.cancel": "Cancelar",
+3 -3
View File
@@ -425,9 +425,9 @@ export const dict: Record<I18nKey, string> = {
"gitView.commit.generate": "Генерувати",
"gitView.commit.generateAria": "Згенерувати повідомлення коміту",
"gitView.commit.messagePlaceholder": "Повідомлення коміту",
"gitView.commit.push": "Push",
"gitView.commit.pushAria": "Push",
"gitView.commit.pushing": "Push...",
"gitView.commit.push": "Commit & sync",
"gitView.commit.pushAria": "Commit and sync",
"gitView.commit.pushing": "Sync...",
"gitView.commit.selectFilesHint": "Виберіть файли в розділі «Зміни», щоб увімкнути коміт.",
"gitView.commit.title": "Коміт",
"gitView.common.cancel": "Скасувати",
+3 -3
View File
@@ -425,9 +425,9 @@ export const dict: Record<I18nKey, string> = {
'gitView.commit.generate': '生成',
'gitView.commit.generateAria': '生成提交信息',
'gitView.commit.messagePlaceholder': '提交信息',
'gitView.commit.push': '推送',
'gitView.commit.pushAria': '推送',
'gitView.commit.pushing': '推送中...',
'gitView.commit.push': 'Commit & sync',
'gitView.commit.pushAria': 'Commit and sync',
'gitView.commit.pushing': 'sync 中...',
'gitView.commit.selectFilesHint': '在“更改”中选择文件以启用提交。',
'gitView.commit.title': '提交',
'gitView.common.cancel': '取消',