Skip to content

[NUCLEO_F302R8] Add LSE configuration for RTC #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 24, 2014
Merged

[NUCLEO_F302R8] Add LSE configuration for RTC #274

merged 5 commits into from
Apr 24, 2014

Conversation

bcostm
Copy link
Contributor

@bcostm bcostm commented Apr 24, 2014

No description provided.

@bogdanm
Copy link
Contributor

bogdanm commented Apr 24, 2014

For some reason, your last 3 or 4 pull requests contain a very weird looking history of previous commits. I'm going to accept this one, but in the future I recommend one of the following:

  1. merge code from our main repository to your repository before modifying code and issing a pull request
  2. if that doesn't work, something has likely happened with your local repository, so I recommend making a fresh clone of our repository and work from that (there are other things to try, but this is probably the quickest one).

Thanks,
Bogdan

bogdanm added a commit that referenced this pull request Apr 24, 2014
[NUCLEO_F302R8] Add LSE configuration for RTC
@bogdanm bogdanm merged commit 99a8b21 into ARMmbed:master Apr 24, 2014
@PrzemekWirkus
Copy link
Contributor

Maybe using git pull --rebase would help?

Some delivery like this should be on top of the current code:

git pull
... add your changes
git add X Y Z
...
git commit -m ""Added X Y Z"
...
git pull --rebase

... Your changes on top of current code

@bogdanm
Copy link
Contributor

bogdanm commented Apr 24, 2014

That would help, yes, but we're fine with simply merging (in my experience, rebase (or rather the way git does rebase) tends to confuse people). Still, we should aim to minimize the mess created by all these merges.

bridadan pushed a commit that referenced this pull request Jun 21, 2016
[test porting] Development branch rebase 09/06/2016
ccli8 pushed a commit to ccli8/mbed-os that referenced this pull request Aug 13, 2024
* Fix PWM API for reading microseconds on LPC1768

* Fix semihosting related compile errors, fix pwm deinit

* Fix some mistakes, fix PWM frequency adjustment

* Fix a few more issues
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants