fix: simplify git sync button label when on base branch
This commit is contained in:
@@ -1112,7 +1112,7 @@ export function GitDiffPane({ serverId, agentId, cwd }: GitDiffPaneProps) {
|
|||||||
if (!isOnBaseBranch || hasRemote) {
|
if (!isOnBaseBranch || hasRemote) {
|
||||||
allActions.set("merge-from-base", {
|
allActions.set("merge-from-base", {
|
||||||
id: "merge-from-base",
|
id: "merge-from-base",
|
||||||
label: isOnBaseBranch ? `Sync ${baseRefLabel} from origin` : `Update from ${baseRefLabel}`,
|
label: isOnBaseBranch ? "Sync" : `Update from ${baseRefLabel}`,
|
||||||
pendingLabel: "Updating...",
|
pendingLabel: "Updating...",
|
||||||
successLabel: "Updated",
|
successLabel: "Updated",
|
||||||
disabled: mergeFromBaseDisabled,
|
disabled: mergeFromBaseDisabled,
|
||||||
|
|||||||
Reference in New Issue
Block a user