updated personal bio and fixed typo in recent news #121
Conversation
|
@tsalo it says I can automagically merge, but I know you had a |
|
It's fine to merge into master directly. The goal is to have the lab member in charge of the lab website render any changes merged from the rest of the lab in staging and then for that manager to open the PR into master. However, we don't have anyone in charge of the lab website, so there's no real reason to preserve the fork-->staging-->master pipeline. Before you merge, though, it looks like there were some merge conflicts that weren't resolved. I'll add comments to show what I mean. |
| twitter: 62442katieb | ||
| --- | ||
|
|
||
| <<<<<<< HEAD:team/_posts/2017-01-06-katherine-bottenhorn.md |
There was a problem hiding this comment.
The <<<<<<, =====, and >>>>>> sections are indicating merge conflicts that were saved rather than resolved. Can you remove the old version of the paragraph? The same issue occurs in news/_posts/2017-09-30-poudel-psychiatryletter.md as well.
There was a problem hiding this comment.
yeah, my b. i only saw those after I fetched the upstream
There was a problem hiding this comment.
should be good now, I think...
|
LGTM. Feel free to merge whenever you want. |
2 participants
No description provided.