search

dominikbraun / timetrace

A simple CLI for tracking your working time.
Apache License 2.0
679 stars 75 forks source link

Readme #149

Closed jwnpoh closed 3 years ago

jwnpoh commented 3 years ago

Addresses #148.

jwnpoh commented 3 years ago

Sorry, it seems I have also included my commit for another issue into this PR. This is the first project that I'm submitting PRs for so apologies for the repeat commit. I'm not sure how to undo/rectify this repetition; would appreciate it greatly if someone could kindly provide some guidance on this!

aligator commented 3 years ago

Hi, thanks for your PRs,

That's no problem, we will handle this :-)

(edit: actually when your other PR is merged, it won't matter anymore as git is very smart :-)

jwnpoh commented 3 years ago

That's good to know, thanks!

dominikbraun commented 3 years ago

@jwnpoh: #147 is now merged. This means that you can update your timetrace fork and then merge main into your readme branch. Since the confirmation-related changes are already included in this branch after merging main, they won't appear in this PR anymore.

Edit: I think you don't have to do this; only if you want to.

jwnpoh commented 3 years ago

Thanks for the pointers! I'll give it a try even if only just to get a better grasp of how branching and merging works.

dominikbraun commented 3 years ago

Nice, as you can see your merge created a merge commit and the confirmation-related changes don't appear as difference anymore, because they're now included in the target branch.

dominikbraun commented 3 years ago

This PR is included in timetrace v0.11.1.