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

mergeFromTo conflicts not detected in case of autostash #715

Open
paztis opened this issue Jan 10, 2022 · 0 comments
Open

mergeFromTo conflicts not detected in case of autostash #715

paztis opened this issue Jan 10, 2022 · 0 comments

Comments

@paztis
Copy link

paztis commented Jan 10, 2022

When --autostash option is enable, conflict are displayed in the log after the merge success.

If I've a non commited file A added locally, and the same in master, then do

git merge origin master --autostash

result is

Updating 67e11a8..0bce1f4
Created autostash: de49df9
Fast-forward
 action/action-test-1.json | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 action/action-test-1.json
Applying autostash resulted in conflicts.
Your changes are safe in the stash.
You can run "git stash pop" or "git stash drop" at any time.

but the mergeResult in SimpleGit is success.

If I ask simpleGit.status(), conflit is well displayed.

I thing this use case is not managed in the log parser.

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

No branches or pull requests

1 participant