Since updating to 4.0 ( about 5 minutes ago ) I have been unable to merge or rebase branches using the old workflow.

@FredrikNoren to replicate you can just fork austinrivas.meteor.com, ungit as usual, and try to merge iron-router with dev and dev with master