github-for-mac-issues icon indicating copy to clipboard operation
github-for-mac-issues copied to clipboard

Published 20 hours ago • verified publisher icon baldwindavid

Merging branches does not recognize new changes to sync

Open baldwindavid opened this issue 13 years ago • 11 comments

It seems that when merging the receiving branch does not recognize that new changes can be synced with Github

Steps performed

  • add and checkout "experimental" branch
  • add/commit to experimental branch
  • merge experimental branch into master
  • master displays button "Branch in Sync" even though it is no longer in sync - pressing button does nothing

How to fix

  • add a new commit directly in master
  • "Sync Branch" appears and can sync to Github

baldwindavid avatar Jun 23 '11 15:06 baldwindavid

Github support looking into it

baldwindavid avatar Jun 24 '11 00:06 baldwindavid

In 1.0.2, after performing the same steps, I encounter the "Sync Branch" button rather than "Branch in Sync". However, this button is disabled and clicking it does nothing. I can unlock the button by switching out to the "Repositories" view and then switching back rather than having to restart the application.

baldwindavid avatar Jun 24 '11 01:06 baldwindavid

I can verify it. If I "git push" from the terminal the changes get pushed upstream but if I tell the github client to it tries to but nothing arrives upstream.

Using v1.0.6

tiagoboldt avatar Aug 16 '11 01:08 tiagoboldt

Merging branches still doesn't work at all in 1.0.8, says it's done it, never arrives on GitHub.

oldskool73 avatar Sep 14 '11 05:09 oldskool73

^clarifying the above remark after testing, it doesn't seem to work at all if I'm trying to merge my 'experimenta' branch into another branch that I don't already have locally. If I use the terminal to co the other branch first I can then relaunch the client and do the merge fine.

oldskool73 avatar Sep 14 '11 06:09 oldskool73

It still doesn't work in 1.2.6. Which is pretty poor.

barryrichards avatar Apr 16 '12 08:04 barryrichards

Still having an issue with this. However i've found a better work around.

To merge master branch with staging branch

  • Merge with the GUI
  • When it's finished, switch to staging branch (won't work in master)
  • Go to the drop down menu: Repository > Synchronize (Cmd S)
  • The merge will instantly show up on GitHub

AdamBrodzinski avatar May 08 '12 01:05 AdamBrodzinski

Same issue still occurring in 1.2.14

big thanks to AdamBrodzinski, that workaround did the trick!

noisymime avatar Jul 19 '12 12:07 noisymime

This stopped working again after updating to Dropbears. The workaround above does not work. Please advise.

markpiro avatar Jan 10 '13 11:01 markpiro

Same bug here. Can't merge with master, and workaround is not working.

jesseorndorff avatar Jan 28 '13 06:01 jesseorndorff

Merge branch B->A Change branch so HEAD points to A sync if it doesn't work then open git shell type "git push" done

chrisyang2013 avatar Sep 05 '14 07:09 chrisyang2013