Skip to content

Add tests for merge conflict due to unstaged conflicting change. #391

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add tests for merge conflict due to unstaged conflicting change. #391

wants to merge 1 commit into from

Conversation

jdblischak
Copy link
Contributor

@stewid I added some tests (currently failing) related to Issue #389.

I didn't update the documentation or messaging because ideally this situation can be properly handled by returning the appropriate values after a merge conflict due to unstaged changes:

  • fast_forward should be returned as FALSE instead of NULL
  • conflicts should be returned as TRUE instead of NULL
  • sha should be returned as NA_character_ instead of NULL
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant

@jdblischak