Skip to content

Potential fixes for 3 code quality findings #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Jordonbc wants to merge 3 commits into from
Closed

Potential fixes for 3 code quality findings #179

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
332b859
Apply suggested fix to Frontend/src/scripts/features/branches.ts from…
Jordonbc Mar 16, 2026
e322036
Apply suggested fix to Frontend/src/scripts/features/branches.ts from…
Jordonbc Mar 16, 2026
3cdc975
Apply suggested fix to Frontend/src/scripts/features/branches.ts from…
Jordonbc Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Frontend/src/scripts/features/branches.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,9 @@ export function bindBranchUI() {
notify(`Switched to ${name}`);
await renderList(); // higher-level refresh
await runHook('postSwitchBranch', hookData);
} catch {
notify('Checkout failed');
} catch (err) {
const details = err instanceof Error ? err.message : String(err);
notify(`Checkout failed: ${details}`);
}
}

Expand Down Expand Up @@ -218,7 +219,7 @@ export function bindBranchUI() {
notify(`Merged branch '${name}' into '${cur}'`);
await Promise.allSettled([renderList(), loadBranches()]);
} catch (e) {
const msg = String(e || '');
const msg = String(e);
const looksLikeConflict =
/CONFLICT/i.test(msg) ||
/Automatic merge failed/i.test(msg) ||
Expand Down Expand Up @@ -269,7 +270,7 @@ export function bindBranchUI() {
await loadBranches();
await runHook('postBranchDelete', hookData);
} catch (e) {
const msg = String(e || '');
const msg = String(e);
if (wantForce) { notify(`Force delete failed${msg ? `: ${msg}` : ''}`); return; }
// If not fully merged, offer force delete as a fallback
const ok2 = await confirmDeleteBranch({
Expand Down
Loading