I made two merge requests; the first merged cleanly onto master. The second is not so nice. I'll give the detail below, but my question is: how can I tell if a merge request is going to force a merge commit instead of nicely laying on top of master?
My problem merge request: http://gitorious.org/prlawrence-test/prlawrence-test/merge_requests/1117 In my local clone of prlawrence-test: $ git checkout -b T2 Switched to a new branch 'T2' $ git pull origin refs/merge-requests/1117 >From gitorious.org:prlawrence-test/prlawrence-test * branch refs/merge-requests/1117 -> FETCH_HEAD Merge made by recursive. t2.txt | 5 +++++ t2_2.txt | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-) create mode 100644 t2.txt create mode 100644 t2_2.txt $ git log --pretty=oneline --abbrev-commit master..T2 ffccc2e Merge commit 'refs/merge-requests/1117' of gitorious.org:prlawrence-test/prlawrence-test into T2 fcf2159 Modified first T2 text file. 78ac3cb Added another text file for T2. 6f8b8a5 Added text file for T2. You can see the merge commit... it occurs because the merge request does not already incorporate the latest changes from prlawrence- test:master. Is there a git command I can use from the master branch that will tell me whether or not the merge request will apply nicely? Or do I have to create the integration branch and pull the merge-request to find out? Phil Lawrence --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Gitorious" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/gitorious?hl=en -~----------~----~----~----~------~----~------~--~---
