Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upAdd merge analysis between two branches #629
Conversation
|
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 |
alehed commentedMay 28, 2017
If you want to check the feasibility of a merge between two branches, this might come in handy.