Closed maxbritto closed 8 years ago
so this history looks better, but it appears there is a conflict with the merge. if you update your master branch from this repo rather than your fork, you should be able to fix those conflicts locally
@maxbritto Can you please squash your commits per https://github.com/fastlane/countdown#submit-a-pull-request? Thanks!
@maxbritto Looks like there are some conflicts, would you mind resolving them and squashing your commits?
https://help.github.com/articles/resolving-a-merge-conflict-from-the-command-line/ http://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
I think that this as an extra function is not that useful. You could just simply call addUIInterruptionMonitorWithDescription
yourself.
The issue with the interruption monitor is that it is not called if you are not trying to do something on the page. If the alert appears just before the snapshot it will be captured and the monitor won't be called. You need to try to touch something on the screen to trigger the monitor and hide the alert
Btw I'm sorry I still haven't fixed the commit I had to work on something else and didn't get a chance to look back at this git thing. I will soon.
no worries @maxbritto! going to close this for now to clear it from open issues. please reopen when you have had a chance to make the necessary changes. thanks!
Believe it or not I was in the middle of a Git online course to try to figure this out when you commented and closed it. I think I now understand the basics of git and managing it locally is ok but when trying to publish, rebase, PR, etc...I still doesn't feel like I'm mastering this. Though I managed to create a nice PR with only one commit and no conflicts https://github.com/fastlane/snapshot/pull/454 . Hope this will finally be the one :) Thanks for your help
no problem! @maxbritto! we can definitely help out if necessary too! let us know if you are still running into trouble!
I'm still waiting for someone to review it but I think I got it right. There are some hounds warning ng though
hey @maxbritto, if you wouldn't mind, could you just clean up some of those hound warnings? some of them are irrelevant, but the white space and the tabs vs spaces ones are important to be fixed for future changes, lastly, if you could squash all the commits down to one, that would be amazing. then just make sure to reopen the PR with the button below! thank you!!
@ohwutup there's a new PR: #454, let's move the discussion there :)