miniblog.

@krinkle Huh, that definitely looks like a bug, and a weird one at that. Please file an issue 🙂

My understanding of Rust Foundation and Rust Project has definitely improved following today's talk. Rust Foundation: Handles financial, legal and bureaucratic stuff. Requires a supermajority of votes from both sponsors and the Rust Project. Rust Project: Focuses on building.

@aburka Thanks for the feedback! Definitely agreed on ours vs theirs, it's really confusing. Unfortunately I'm limited to how the sides are named in the file. I like the diff3 conflictStyle in git, as it shows the base as well as both sides. I can't guarantee that the base is visible though, and it gives me three files to diff rather than two. Not sure about this case yet.