Skip to content
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

Using floating numbers for Time Differences #1191

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

BioBox
Copy link

@BioBox BioBox commented Sep 29, 2022

Python's timedelta class can accept floating point numbers as fields, so why restrict ourselves to integers?
This commit was spurred by attempting khal new <datetime> 2.5h <summary> and seeing it failed.

@BioBox
Copy link
Author

BioBox commented Sep 29, 2022

There was a button on github that said "Update Branch" and it made the "Merge branch 'master' into master" commit. Don't know what was up with that.

@mschilli87
Copy link

@BioBox

There was a button on github that said "Update Branch" and it made the "Merge branch 'master' into master" commit. Don't know what was up with that.

I assume the master branch of your fork of khal, to which you commited your changes suggested in this PR, had been branched off an 'outdated' version of this main repositories master branch (or rather, someone else made changes here after your initial branching off). To resolve any potential merge conflicts resulting from that, this repo's master branch was merged on top of yours, applying those 'missing' (but unrelated) changes to 'your' master branch and creating a merge commit to either resolve some actual conflict or preserve the commit relation in the git log.

Copy link
Member

@WhyNotHugo WhyNotHugo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't tested this, but changes make sense to me.

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.

None yet

3 participants