You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by GitBox <gi...@apache.org> on 2020/05/21 11:07:32 UTC
[GitHub] [incubator-nuttx] RB-tel opened a new pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
RB-tel opened a new pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096
Added support for non CONFIG_RTC_HIRES
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] RB-tel commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
RB-tel commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-634582669
> I did the rebase. I had to resolve conflicts in 3 files. I tried to push the changes to your branch, but apparently I did not have permission to do that.
>
> These are the kinds of things that we can help you with if you do not uncheck the box that allows maintainers to have access to your branch.
I understand. The check box was unintentionally kept unchecked.
I did rebase and remove the conflicts for the 3 files. But got status as branch diverged. Tried few things. Still facing issue. Any suggestion on what can be done.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
patacongo commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-633625863
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo removed a comment on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
patacongo removed a comment on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-635633538
I think I can merge this onto a branch, fix the conflicts, then merge it to main. That is not the preferred way of doing things, but might allow us to make some progress on this.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] Ouss4 commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
Ouss4 commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-632835065
Could you please rebase and fix the conflicts.
And also please squash the commits.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
patacongo commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-634609996
You probably have to force the push upstream. That should ignore that fact that the branches has divurged and simply overwrite the old branch with the new one.
Sometimes I just have to re-create a clean version of the branch. If force pushing does not work, then you can try tyat. There might be some better solution but I would probably do a brute force change like:
- rebase the master branch
- rename the old branch
- re-create the branch, applying the changes from the old branch cleanly
- force push the new clean branch. It would certainly be necessary to force in this case.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo closed pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
patacongo closed pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
patacongo commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-635639534
I pulled the changes, resolved the conflicts, and merged to master. I will now have to close this PR. Please verify that the changes are in place correctly.
This is not the correct way to do things. We will need to be more careful in the future. For one thing, please always allow maintainer access to the branch to we can help you out of such difficulties without resorting to these kind of steps.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] RB-tel commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
RB-tel commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-634085842
> @RB-tel You need to rebase this against the current master branch to eliminate the conflicts.
Yes, I am trying to rebase. Facing issues. Will resolve them ASAP.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] RB-tel commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
RB-tel commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-635947402
> I pulled the changes, resolved the conflicts, and merged to master. I will now have to close this PR. Please verify that the changes are in place correctly.
>
> This is not the correct way to do things. We will need to be more careful in the future. For one thing, please always allow maintainer access to the branch to we can help you out of such difficulties without resorting to these kind of steps.
Thanks a lot. The changes are placed correctly. Thank you.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-nuttx] patacongo commented on pull request #1096: Updated Rx65n rtc for non CONFIG_RTC_HIRES
Posted by GitBox <gi...@apache.org>.
patacongo commented on pull request #1096:
URL: https://github.com/apache/incubator-nuttx/pull/1096#issuecomment-635633538
I think I can merge this onto a branch, fix the conflicts, then merge it to main. That is not the preferred way of doing things, but might allow us to make some progress on this.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org