Question

I am trying to get the hang of merging branches with the GitHub for Mac GUI. I’m not sure if it’s me or the client at this point….

I have a repo with master, staging, production branches. I created a file in master called test.txt. I then added a test line to it. I committed and synced in the master. I merged from master to staging using the gui, then hit merge. I also re-clicked “branches in sync” to re-sync them. The new line shows up in GitHub under master, but not under staging. In my local repo, it shows both in sync with that latest commit.

My plan was to edit in master, merge to staging to deploy and test, rinse, lather & repeat until it’s good, then merge to production (at this point all should be in sync).

Am I doing something wrong?

Answer 1

That looks like GitHub for Mac issue 3:

Merging branches does not recognize new changes to sync

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

---

The OP skinnygeek1010 reports:

I’ve found a nice workaround:

To merge master with staging, merge with the GUI.
When it’s finished, switch to staging and then go to the drop down menu: Repository > Synchronize (Cmd S).
The merge will instantly show up on GitHub (won’t work if you Sync in master though)