breautek commented on PR #133: URL: https://github.com/apache/cordova-plugin-device/pull/133#issuecomment-1087948205
That didn't work.. Upon closer inspection, looks like your fork is out-dated from apace's master. You're going to want to add apache's remote to your fork: `git remote add apache https://github.com/apache/cordova-plugin-device.git` Then fetch it: `git fetch apache` Then rebase apache's master into your master: `git rebase apache/master` You can do all of this on your own fork's master. During the rebase, you should hit the conflict that it's complaining about and solve it. -- 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
