search

Billingegroup / rg-db-public

Public Research Group Database
BSD 2-Clause "Simplified" License
1 stars 71 forks source link

Adding Dominic's Info to people.yml #464

Closed dpeters001 closed 2 years ago

dpeters001 commented 2 years ago

Adding Dominic's information to the people.yml file in public repository

sbillinge commented 2 years ago

These edits look good but this file is now conflicted with other changes to files that have been merged by others (don't worry, it happens).

One comment....please go through and say "done" or respond in some way to each inline comment. This is a general comment, but it makes the review easier because the reviewer then knows you have seen the comment and what you think about it.

But to resolve the conflict, check out and synchronize your local master with upstream, then re-check out his branch, then merge master into this branch. It will raise merge conflicts that you have to resolve by hand (be careful deleting things that you didn't edit). Then commit and push again.

sbillinge commented 2 years ago

thanks @dpeters001