Skip to content
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.

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

cannot display 'CHERRY-PICKING' in prompt when conflicting #818

Closed
NihilityT opened this issue Nov 27, 2020 · 1 comment · Fixed by #828
Closed

cannot display 'CHERRY-PICKING' in prompt when conflicting #818

NihilityT opened this issue Nov 27, 2020 · 1 comment · Fixed by #828

Comments

@NihilityT
Copy link
Contributor

System Details

  • posh-git version/path: 1.0.0 beta4 ~\Documents\WindowsPowerShell\Modules\posh-git\1.0.0
  • PowerShell version: 5.1.18362.1110
  • git version 2.26.2.windows.1
  • OS: Microsoft Windows NT 10.0.18363.0

Issue Description

When I cherry-pick a commit, I got many conflict warnings, but the prompt in powershell did not show that I was in cherry-pick mode

Steps to reproduce

# powershell

mkdir git-test
cd git-test
git init
echo 1 > test.txt
git add *
git commit -am 'first'
git checkout -b 'conflict'
echo 2 > test.txt
git commit -am 'second'
git cherry-pick master
git status
@NihilityT NihilityT changed the title cannot show 'CHERRY-PICKING' in prompt when conflicting cannot display 'CHERRY-PICKING' in prompt when conflicting Nov 27, 2020
@dahlbyk
Copy link
Owner

dahlbyk commented Nov 28, 2020

Thanks for the report/repro!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging a pull request may close this issue.

2 participants