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
Clone PR with merge
instead rebase
#2
Conversation
@bradrydzewski Here my PR in the new repo, as suggested by you in drone-plugins/drone-git#76 (comment) |
thanks, do we need to modify the unit tests here? If I remember correctly the goal was to avoid creating a new merge commit. If this pull request is able to checkout the correct commit sha, we should not need to modify the unit tests. |
Oh, yeah, forgot to add: |
@bradrydzewski Anything I can do to speed up this topic / PR? |
hey there, this change was manually merged and applied to master, so this can be closed :) thanks again for all your research, much appreciated. |
@bradrydzewski Glad to see the change from I was surprised to not see my additional unit tests being adopted - those really show why the new behaviour is better... and guard against future regressions in this area. I invested quite some time into that and am convinced they are a substantial improvement. I must admit that the deeper concepts of how git branching, merging etc work can be quite complicated if you are unfamiliar with it. If you would like to invest the time to learn about it, I would be happy to help. Since Drone is closely tied to version control, I am sure you would not regret diving deeper. |
No description provided.