search

scottlamb / moonfire-nvr

Moonfire NVR, a security camera network video recorder
Other
1.2k stars 138 forks source link

Update time.md #165

Closed jlpoolen closed 2 years ago

jlpoolen commented 2 years ago

flagged "ppm" to indicate it is defined in the glossary

jlpoolen commented 2 years ago

First time trying to submit a patch and/or pull. Want to combine my change to glossary, as well, and it is not readily apparent how to accomplish that through the Github interface.

scottlamb commented 2 years ago

First time trying to submit a patch and/or pull. Want to combine my change to glossary, as well, and it is not readily apparent how to accomplish that through the Github interface.

I'm not sure it's possible. I think github's UI for making a pull request from scratch is just a convenience for quickie one-line changes. The usual and more flexible flow is to make a commit on my local machine, push it to a branch in my fork of the repository, and then create a pull request from github's UI based on that branch. I've never heard anyone praise how easy git is to learn compared to other version control systems, but you do get used to it.

Would you like to try doing that, or should I merge your glossary change and then this one?

jlpoolen commented 2 years ago

Please pull the two patches, if you agree.

I already have modification in my fork, one which I wanted to submit, and one that I did not. I have as a "todo" trying to learn how I can specify one file, but not another in a commit. This is all to say that my local copy is polluted and not ready to take these two modification and push them up.