Update from master silently fails when there is a merge conflict

Describe the bug

When working on a separate branch, update from master silently fails when there are merge conflicts

Version & OS

2.5.0 MacOS Open ‘About GitHub Desktop’ menu to see the Desktop version. Also include what operating system you are using.

Steps to reproduce the behavior

1. Switch to a non master branch
2. Click Branch -> Update from master
3. Nothing happens

Expected behavior

Update from master should pull the updates from master and notify if there is a merge conflict

Actual behavior

Nothing happens

Screenshots

Add screenshots to help explain your problem, if applicable.

Logs

Attach your logs by opening the Help menu and selecting Show Logs..., if applicable.

Additional context

Add any other context about the problem here.

[thesyntaxinator]

No, my steps are: Switch to non master branch Make changes Don’t commit those changes Have someone else make, commit, and push conflicting changes to master branch From GitHub desktop (still on non master branch with uncommitted changes) click update from master

• GitHub desktop does nothing, whereas it should pull the changes and notify that there is a conflict

[tierninho]

Thanks for the update. So these are your steps?

• Switch to a non-master branch
• open command line to run git pull origin master, merge conflicts present
• Go back to Desktop to see merge conflicts
• Click Branch -> Update from master

Any chance you could share the logs?