From 43c205e315cd74313a153c0825e2fdb7b69565ee Mon Sep 17 00:00:00 2001 From: luxxmr Date: Tue, 18 Mar 2025 01:41:17 -0700 Subject: [PATCH] README.md file update to include the "git-undo" command conflict with git-extra. (#77) --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 2b20590..21f4273 100644 --- a/README.md +++ b/README.md @@ -192,6 +192,15 @@ If you're using [oh-my-zsh](github.com/robbyrussell/oh-my-zsh): `source ~/.zshrc` +### Note on `git-undo` Command Conflict + +If you have both `ugit` and `git-extras` (https://github.com/tj/git-extras) installed, be aware that both provide a `git-undo` command. This can lead to conflicts, as only one version of the command will be accessible at a time. To resolve this: + +- **Using Homebrew**: Homebrew will notify you of the conflict during installation. You can choose to unlink the conflicting formula or use the --overwrite flag to force the link as follows: + + `brew link --overwrite ugit` + +- **Manual Installation**: Ensure that the `git-undo` command from the desired package is prioritized in your system's PATH. ## Please read ⚠️