SailingSteve commented on PR #133: URL: https://github.com/apache/cordova-plugin-device/pull/133#issuecomment-1089770036
Thanks! I'll do that on Thursday. On 4/5/22 1:09 PM, Norman Breau wrote: > > I'm sorry, I use git all day, but only in a simple and repetitive way. > > No worries, I wasn't used to rebasing until I started contributing to > Cordova/other open source projects myself. For the longest time I was > afraid of rebasing (because it can be dangerous) > > But the extra commits is still problematic. Not sure why the PR > believes these are new commits. While the changes are okay, having all > of these commits in this PR will be problematic if we ever have to > revert this PR in the future for whatever reason. > > It might be easier to create a new branch off of current master and > cherry-pick the commits that is actually related to this PR. > > I've gone ahead and created a PR > <https://github.com/SailingSteve/cordova-plugin-device/pull/1> against > your own fork. You won't be able to merge it due to merge conflicts > because you're fork's master is in a diverged state. But if the > changes looks like they are matching what should be provided here, > then there are instructions in the PR that should be enough to correct > it the diverged state problem and once you force push your master, it > should reflect here with your single commit encapsulating all your > changes. > > — > Reply to this email directly, view it on GitHub > <https://github.com/apache/cordova-plugin-device/pull/133#issuecomment-1089278084>, > or unsubscribe > <https://github.com/notifications/unsubscribe-auth/ABU2LBJFX3YB5JGYEVPIACLVDSMYDANCNFSM4SSQQEGA>. > You are receiving this because you authored the thread.Message ID: > ***@***.***> > -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: issues-unsubscr...@cordova.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@cordova.apache.org For additional commands, e-mail: issues-h...@cordova.apache.org
