-
Notifications
You must be signed in to change notification settings - Fork 358
Delay auto resolve skippable dialog #219
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
base: master
Are you sure you want to change the base?
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 for the patch. Mostly looks ok, added a few comments.
As I mentioned when I started looking at this, it would be nice to rebase and squash this change into a single commit to merge. $ git rebase -i Squash all commits after the first one in the list so they're all combined into oneChange the commit message to describe what this is doing (e.g https://chris.beams.io/posts/git-commit/ is a nice tutorial)Replace your branch with the squashed commit$ git push origin -f HEAD:master |
@stewartmiles Doesn't the git could squash whenever you merge my branch into your branch? https://github.blog/2016-04-01-squash-your-commits/ Or I am misunderstand this blog post? Anyway I would fix everything as your comment first and would look about squashing or recommitting this when there was the last thing to be fixed |
also use Resolver.AutomaticResolutionEnabled() to skip the popup Update PlayServicesResolver.cs Update PlayServicesResolver.cs Delay auto resolve dialog add AutoResolutionDelay
@stewartmiles I have tries to squash by tortoisegit, is this what you expected? |
@Thaina typically I would use the command line to do this using I think it's possible to do the same with tortoisegit https://stackoverflow.com/questions/12528854/how-to-perform-rebase-squash-using-tortoisegit |
@stewartmiles I have already did that and the result is as I have committed here > 4f15dd7 |
I merged / rebased and squashed this commit into a local repo, the result is here stewartmiles@fe13245 At the moment this doesn't really work.
Any chance you built this and managed to test it? |
I have fix it by using progressbar dialog. Now it could only cancel or wait to have it closed by itself I could build the dll too. But it required to change something in gradle to let it be able to built in windows |
883eedd
to
5c6f23b
Compare
For #217