I merged two branches with different feature sets. I branched from one of the two then merged in the second (using command line and file merge). Now in Xcode's source control pane it shows two different branches as current. It's not a big deal but I would like to know how to get rid of the top one (at the very least) and preferably to understand why both would be displayed as current. It makes pushing to remotes a bit of a headache because they have the same app name and so I need to make sure I don't push to the wrong branch. I don't particularly want to have to redo things a different way since the branches had a fair number of merge conflicts.
Also, if I use Xcode to commit, a bunch of extra files ending with .orig come up as well as many .pbxproj files that I cannot find when I search my file directory.
