search

nih-cfde / organization

Main repository for meta information about the organization
Other
7 stars 8 forks source link

New Google Drive Images #11

Closed josesanchez1815 closed 4 years ago

josesanchez1815 commented 4 years ago

Included new images for the https://github.com/nih-cfde/organization/blob/master/CommunicationManagementHelp.md#sharing-files

ACharbonneau commented 4 years ago

Hey @josesanchez1815

Does github show you the branch conflicts on this? I'm honestly not sure if you can see them without admin access.

josesanchez1815 commented 4 years ago

@ACharbonneau Yes it does. I missed it Sorry!

ACharbonneau commented 4 years ago

No worries :) Do you know how to do conflict fixes in github? If not I can show you

josesanchez1815 commented 4 years ago

Oh I figured it out based on some tutorials.

ACharbonneau commented 4 years ago

Awesome! So, just FYI, it probably didn't have the conflict when you did the PR, because I think what happened is that you submitted this PR, and then noticed that you needed to merge in the one from yesterday. But merging in yesterdays changes meant that now this PR had a different base. Looks like it was an easy fix though, and I'm delighted you figured it out :)

josesanchez1815 commented 4 years ago

Wow you hit it on the nail! That is exactly what happened