Branch merge issues with GitHub for Mac

Question

I am trying to combine branches with the GitHub for Mac GUI. I am not sure if it is me or the client at this moment ....

I have a repo with a master, staging, production units. I created a file in master called test.txt. Then I added a test line to it. I committed and synchronized to the master. I teamed up with the wizard to organize using gui and then hit the merge. I also re-clicked branches in sync to re-sync them. A new line is displayed on GitHub under the control of the wizard, but not under the control. In my local repo it appears as in sync with the last commit.

My plan was to edit the master, merge onto the stage to deploy and test, rinse, pour and repeat until it is good, and then change to production (at this stage everything should be synchronized).

Am I doing something wrong?

Answer 1

It looks like github for mac problem 3 :

Merging branches do not recognize new changes for synchronization

It seems that when merging the receiving branch it doesn’t recognize that new changes can be synchronized with Github

Completed steps

• add and check out the " experimental " branch
• add / commit to experimental branch
• merge experimental go to master
• master displays the " Branch in Sync " button, even if it is no longer synchronized - the "does nothing" button

How to fix

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

---

OP skinnygeek1010 reports:

I found a nice workaround:

To combine the wizard with an intermediate state, combine it with a graphical interface.
When done, go to setup, and then go to the drop-down menu: Repository > Synchronize ( Cmd S ).
The merge will display immediately on GitHub (will not work if you synchronize in master, though)