You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
The text was updated successfully, but these errors were encountered:
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
result is
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.
The text was updated successfully, but these errors were encountered: