Skip to content
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

Test for FF'ability is left to catching a fail from git plugin #87

Open
RandomSort opened this issue Nov 8, 2017 · 0 comments
Open

Comments

@RandomSort
Copy link

In GitIntegrationStrategy line 130 -> 139 we try to do a fastforward merge catching errors.
We do not care or trigger on whether the merge failed or if it was not possible to fastforward merge.

This does not seem to be the best strategy. We can test whether the merge can possibly be a FF merge before even attempting it by for instance checking the output of git log master..ready/mydelivery if this is empty a ff merge is possible.

This is of course neither blocking or critical, just a refactoring.

@buep buep added this to the Backlog milestone Nov 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants