search

abentley / oaf

A Git client that brings a more user-friendly CLI to Git.
Apache License 2.0
9 stars 1 forks source link

Poor handling of "Your local changes to the following files would be overwritten by merge" #43

Open abentley opened 2 years ago

abentley commented 2 years ago

Stashed WIP changes to refs/branch-wip/develop Switched to develop thread 'main' panicked at 'called Result::unwrap() on an Err value: Output { status: ExitStatus(ExitStatus(256)), stdout: "", stderr: "error: Your local changes to the following files would be overwritten by merge:\n\tlivemonitor/diagnostics/alerts_metrics.py\nPlease commit your changes or stash them before you merge.\nAborting\n" }', src/worktree.rs:758:63 note: run with RUST_BACKTRACE=1 environment variable to display a backtrace

abentley commented 2 years ago

Also The following untracked working tree files would be overwritten by checkout: