question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Successful merge banner appears when a merge doesn't actually happen

See original GitHub issue

Description

Successful merge banner appears when clicking Update from master and it doesn’t take into account if an actual merge occurs.

Version

  • GitHub Desktop: 1.5.1-beta0
  • Operating system: 10.14.1 (18B75) - Mojave

Steps to Reproduce

  1. Find a branch that is up to date with master
  2. Click update from master from branch menu
  3. Observe that the banner appears even though a merge didn’t occur

Expected Behavior

  • The banner shouldn’t appear when a merge don’t actually happens

Actual Behavior

  • The banner appears either way

Additional Information

merge_banner_appears_in_the_wrong_time

Issue Analytics

  • State:closed
  • Created 5 years ago
  • Reactions:1
  • Comments:14 (14 by maintainers)

github_iconTop GitHub Comments

3reactions
ampinskcommented, Jan 14, 2019

Ooh I was thinking in the same banner area and it would disappear. Keeping the check would possibly still make sense as well.

1reaction
niikcommented, Jul 1, 2022

It says “This branch is already up to date with {default branch name}.” It has a green check to the left of it in the same way as the success banner does.

This was fixed in https://github.com/desktop/desktop/pull/10453

Read more comments on GitHub >

github_iconTop Results From Across the Web

Solved: Cannot merge pull request if any changes have been...
The work was done in different areas so there will be no merge conflicts when they are merged in. First pull request is...
Read more >
How to use merge checks to enforce your master branch
Merge checks in Bitbucket make it easy to ensure that every Pull Request is fully vetted before it gets merged and keep your...
Read more >
Troubleshooting Data Merge Errors - CreativePro Network
This can happen because there are not enough fields in the header row. To demonstrate this, take the following database. It has three...
Read more >
GIT merge successfully but introduce a compilation error
Just fix it, commit and move on with your life. – Cristian. Aug 12, 2014 at 17:27. actually this happens ...
Read more >
The Ethereum Merge is completed: Here's what's next
The Ethereum blockchain has successfully completed its shift away from proof-of-work to proof-of-stake (PoS) consensus following the merge ...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found