From 891b20c935d297e84296ba63608f935acbdbf2df Mon Sep 17 00:00:00 2001 From: Josh Story Date: Wed, 13 Nov 2024 13:50:58 -0800 Subject: [PATCH 1/2] Update socials for Josh Story (#7290) --- src/content/community/team.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/content/community/team.md b/src/content/community/team.md index 221a8db878..b119254077 100644 --- a/src/content/community/team.md +++ b/src/content/community/team.md @@ -38,7 +38,7 @@ Current members of the React team are listed in alphabetical order below. Joe was planning to major in math and philosophy but got into computer science after writing physics simulations in Matlab. Prior to React, he worked on Relay, RSocket.js, and the Skip programming language. While he’s not building some sort of reactive system he enjoys running, studying Japanese, and spending time with his family. - + Josh majored in Mathematics and discovered programming while in college. His first professional developer job was to program insurance rate calculations in Microsoft Excel, the paragon of Reactive Programming which must be why he now works on React. In between that time Josh has been an IC, Manager, and Executive at a few startups. outside of work he likes to push his limits with cooking. From feadf7d61a72a24a8d4db74467d8fd67044e86ec Mon Sep 17 00:00:00 2001 From: Xleine Date: Thu, 14 Nov 2024 10:25:31 +0800 Subject: [PATCH 2/2] fix conflict --- src/content/community/team.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/content/community/team.md b/src/content/community/team.md index a62c6a5911..5e79f8caee 100644 --- a/src/content/community/team.md +++ b/src/content/community/team.md @@ -38,13 +38,8 @@ React 核心团队成员全职致力于核心组件 API 的开发，负责 React Joe 原计划专攻数学和哲学，然而在用 Matlab 编写物理模拟后，他转行投入了计算机科学领域。在投身 React 之前，他曾先后在 Relay、RSocket.js 以及 Skip 编程语言上有过工作经验。闲暇之余，乔喜欢跑步、学习日语，还有陪伴家人。 -<<<<<<< HEAD - - Josh 大学主修数学，并在那时期初次接触到编程。他的职业生涯起步于在 Microsoft Excel 上编程进行保险费率计算，这是反应式编程的典型案例，或许也是他后来投身 React 的原因。此后，Josh 在数家创业公司中担任过独立贡献者、经理甚至高级管理者。工作之外，他享受烹饪的挑战。 -======= - Josh majored in Mathematics and discovered programming while in college. His first professional developer job was to program insurance rate calculations in Microsoft Excel, the paragon of Reactive Programming which must be why he now works on React. In between that time Josh has been an IC, Manager, and Executive at a few startups. outside of work he likes to push his limits with cooking. ->>>>>>> 891b20c935d297e84296ba63608f935acbdbf2df + Josh 大学主修数学，并在那时期初次接触到编程。他的职业生涯起步于在 Microsoft Excel 上编程进行保险费率计算，这是反应式编程的典型案例，或许也是他后来投身 React 的原因。此后，Josh 在数家创业公司中担任过独立贡献者、经理甚至高级管理者。工作之外，他享受烹饪的挑战。