-
Notifications
You must be signed in to change notification settings - Fork 281
Add merge analysis between two branches #629
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks again! Tests would be very nice here as well.
To my knowledge there is no way to get ObjectiveGit to give me an "unborn" branch, that is one with an empty SHA, so GTMergeAnalysisUnborn is never returned. |
Any idea why the test fails? Locally the (iOS) tests all succeed with the newer versions of Quick and Nimble. |
My guess is that we are still running tests with Xcode 8.0 on Travis until #631 is merged. There could be some changes in Xcode and/or Nimble and Quick that cause this. |
Hope the tests pass now. |
About "unborn" : you can get one by deleting the ref pointed to by Since you can only merge a branch in |
The reason why I needed this is for pulling a branch other than the current one. Think What I meant was that since the method takes branches, there is no way to pass it the nonexistent target of head, which means Btw, feel free to sqash merge this, I realized I merged master into it instead of rebasing ontop of it. |
Yeah; it seems that this is similar to giving |
Now with upstream having this feature, the PR would have to be reworked completely. I'm not working on this any more, so closing. |
If you want to check the feasibility of a merge between two branches, this might come in handy.