planetarypy / TC

PlanetaryPy Project Technical Committee
https://planetarypy.org/
1 stars 2 forks source link

Draft agenda for tomorrow. #52

Closed rbeyer closed 3 years ago

michaelaye commented 3 years ago

So, this is weird, I clicked "Edit this file" to add another agenda point. That's how my PR was created. So, is that a PR on a PR or does that function simply copy Ross's PR and makes it look like my PR came up with all the text? That's somehow plagiaritic.. ;)

rbeyer commented 3 years ago

Sorry, I merged these too quickly for you to see it, maybe. When you "Edited this file" you created a PR that was based on my PR. Since my PR now had an approval, I merged it. As soon as I did so, your PR showed that it had been auto-rebased on master, since the PR it was based on got merged. Then I approved it, and then could merge it. All very slick, and the commit history on the repo preserves it.

michaelaye commented 3 years ago

Ah, that's actually what I was hoping how it worked, but sometimes I'm dreaming up "common-sense" functionality and the devs just scoff at me.. ;)