BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: make branch updates use latest remote refs

Browse Source 
Fetch remote targets before merge or rebase
Prefer remote branch targets over stale local branches
Fix Update copy and branch search input
This commit is contained in:
Bohdan Triapitsyn
2026-05-06 00:32:55 +03:00
parent 8540f51395
commit 32929d592e
7 changed files with 108 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/lib/i18n/messages/en.ts
+11 -11
View File
@@ -364,19 +364,19 @@ export const dict = {
'sessions.sidebar.sessionDialogs.actions.deleteLocalBranch': 'Delete local branch',
'sessions.sidebar.sessionDialogs.actions.deleting': 'Deleting…',
'sessions.sidebar.sessionDialogs.actions.deleteWorktree': 'Delete worktree',
'gitView.branch.branchToMergeInto': 'Branch To Merge Into',
'gitView.branch.branchToRebaseOnto': 'Branch To Rebase Onto',
'gitView.branch.branchToMergeInto': 'Branch to merge into {branch}',
'gitView.branch.branchToRebaseOnto': 'Branch to rebase onto',
'gitView.branch.create': 'Create new branch...',
'gitView.branch.currentBadge': 'Current',
'gitView.branch.currentBranchFallback': 'current branch',
'gitView.branch.currentBranchTooltip': 'Current branch',
'gitView.branch.detachedHead': 'Detached HEAD',
'gitView.branch.dialogDescriptionPrefix': 'Dialog Description Prefix',
'gitView.branch.dialogDescriptionPrefix': 'Choose how to bring another branch into',
'gitView.branch.empty': 'No branches found.',
'gitView.branch.localBranches': 'Local branches',
'gitView.branch.mergeDescription': 'Merge Description',
'gitView.branch.mergeDescription': 'Create a merge commit and preserve branch history.',
'gitView.branch.mergeRebase': 'Merge/Rebase',
'gitView.branch.mergeRebaseTooltip': 'Merge Rebase tooltip',
'gitView.branch.mergeRebaseTooltip': 'Update this branch from another branch.',
'gitView.branch.mergingInProgress': 'Merging In Progress',
'gitView.branch.namePlaceholder': 'Branch name',
'gitView.branch.newBranchPlaceholder': 'New branch name',
@@ -387,17 +387,17 @@ export const dict = {
'gitView.branch.operationFailed': 'Operation Failed',
'gitView.branch.pushToPrefix': 'Push To Prefix',
'gitView.branch.pushToSuffix': 'Push To Suffix',
'gitView.branch.rebaseDescription': 'Rebase Description',
'gitView.branch.rebaseDescription': 'Replay your commits on top of the selected branch.',
'gitView.branch.rebasingInProgress': 'Rebasing In Progress',
'gitView.branch.remoteBranches': 'Remote branches',
'gitView.branch.renameTitle': 'Rename branch',
'gitView.branch.searchPlaceholder': 'Search branches...',
'gitView.branch.selectBranch': 'Select Branch',
'gitView.branch.summaryMergeInfix': 'Summary Merge Infix',
'gitView.branch.summaryMergePrefix': 'Summary Merge Prefix',
'gitView.branch.summaryRebaseInfix': 'Summary Rebase Infix',
'gitView.branch.summaryRebasePrefix': 'Summary Rebase Prefix',
'gitView.branch.updateDescriptionPrefix': 'Update Description Prefix',
'gitView.branch.summaryMergeInfix': 'into',
'gitView.branch.summaryMergePrefix': 'This will merge',
'gitView.branch.summaryRebaseInfix': 'onto',
'gitView.branch.summaryRebasePrefix': 'This will rebase',
'gitView.branch.updateDescriptionPrefix': 'Bring the latest changes into',
'gitView.branch.updateTitle': 'Update branch',
'gitView.changes.changedFilesAria': 'Changed files',
'gitView.changes.clearSelectionAria': 'Clear file selection',