search

pymc-devs / pymc-data-umbrella

Website: Data Umbrella & PyMC open source sessions
https://pymc-data-umbrella.xyz/en/latest/
MIT License
26 stars 38 forks source link

Add contributors to the pymc sprint #123

Closed LucyJimenez closed 2 years ago

LucyJimenez commented 2 years ago

Add five contributors to the pymc sprint.

reshamas commented 2 years ago

@LucyJimenez It looks like Daniel Saunders needs an image placeholder.

Preview: https://pymc-data-umbrella--123.org.readthedocs.build/en/123/2022-07_sprint/sprint_parties/contributors.html

reshamas commented 2 years ago

@LucyJimenez Looks like there are merge conflicts here.

OriolAbril commented 2 years ago

When there are multiple PRs open editing the same files, generally merging the first one generates merge conflicts on the other ones. Even if there weren't any originally. I'll fix it

reshamas commented 2 years ago

@OriolAbril I would like to learn how to fix it. Can you do it on GitHub?

OriolAbril commented 2 years ago

@OriolAbril I would like to learn how to fix it. Can you do it on GitHub?

Saw that too late. It can be done on GitHub. For conflicts whose resolution I see clearly (here it was keeping the content from both branches, sometimes it is combining the content on code and I need to run tests too to make sure I get it right) I click on the button that is shown below the merge conflicts message. This opens a raw text editor with the conflicts marked <, > and = signs, something like:

>>>>people01
content from people01 branch
====
content from main branch
<<<<main

I can try to do the next one over a videocall or take some screenshots. It is also possible to do it locally with similar steps.

reshamas commented 2 years ago

Looks great! Thanks @LucyJimenez & @OriolAbril .