joshgrob commented on issue #699: Sensors/BMA2XX - New PR based on PR #697 changes URL: https://github.com/apache/mynewt-core/pull/699#issuecomment-381202294 Hi @sterlinghughes @rymanluk, quick question. I made the remaining changes, tested the code on my bmd300eval, and successfully did git pull --rebase origin master (from the apache mynewt-core repo). All works well. However, when I try to push to my fork it says it has diverged to much and I must to a git pull from that remote (fork/master in my repo). I tried to a git pull --rebase fork master to align, but I am getting a lot of unexpected conflicts. In short, what it is the best way to push my changes to pull request after I have successfully rebased my changes locally?
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
