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.

Sign up for GitHub

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

Jump to bottom

Readme #149

Merged
merged 2 commits into from
Jul 3, 2021
Merged

Readme #149

merged 2 commits into from
Jul 3, 2021

Conversation

jwnpoh
Copy link
Contributor

@jwnpoh jwnpoh commented Jun 29, 2021

Addresses #148.

@jwnpoh
Copy link
Contributor Author

jwnpoh commented Jun 29, 2021

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
Copy link
Collaborator

aligator commented Jun 29, 2021 •
edited
Loading

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
Copy link
Contributor Author

jwnpoh commented Jun 30, 2021

That's good to know, thanks!

@dominikbraun
Copy link
Owner

dominikbraun commented Jul 2, 2021 •
edited
Loading

@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
Copy link
Contributor Author

jwnpoh commented Jul 2, 2021

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.

aligator
aligator approved these changes Jul 3, 2021
View reviewed changes
Copy link
Collaborator

@aligator aligator left a comment

Choose a reason for hiding this comment

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

LGTM

@dominikbraun
Copy link
Owner

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 dominikbraun self-requested a review July 3, 2021 13:58
dominikbraun
dominikbraun approved these changes Jul 3, 2021
View reviewed changes
Copy link
Owner

@dominikbraun dominikbraun left a comment

Choose a reason for hiding this comment

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

LGTM

@dominikbraun dominikbraun merged commit adb2642 into dominikbraun:main Jul 3, 2021
@jwnpoh jwnpoh deleted the readme branch July 3, 2021 15:01
@jwnpoh jwnpoh restored the readme branch July 4, 2021 07:24
@dominikbraun dominikbraun linked an issue Jul 4, 2021 that may be closed by this pull request
Minor typo in README for Create a record syntax #148
Closed
@dominikbraun
Copy link
Owner

This PR is included in timetrace v0.11.1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dominikbraun dominikbraun dominikbraun approved these changes

@aligator aligator aligator approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Minor typo in README for Create a record syntax
3 participants
@jwnpoh @aligator @dominikbraun