latest 3 messages by rostero
+
[2017-06-30T20:47:39Z]
rostero
and same thing happened when we did feature2 into feature1+feature2. at the bottom it says "merged feature1+feature2 into feature2"
+
[2017-06-30T20:47:01Z]
rostero
that was resolved within github
+
[2017-06-30T20:46:37Z]
rostero
i have three branches: feature1, feature2, and feature1+feature2. we did a pull request for feature1 into feature1+feature2. github says "merged n commits into feature1+feature2 from feature1" then at the very bottom of the list of commits i see "merge branch feature1+feature2 into feature1". what would cause that? note there was a merge conflict at some point