From ca9dc1c1e22b75b61fb6bbba82a95a80c02404cb Mon Sep 17 00:00:00 2001 From: Hugo Jobling Date: Mon, 3 Jun 2019 19:55:39 +0100 Subject: [PATCH 1/3] Use imperative tone for suggested commit message (#2050) This is both widely recommended as the preferred style and also that in which actual commit messages on this project are written. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3044c0d66..10b706b1a 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ The documentation is divided into several sections with a different tone and pur ### Push it -1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fixed header logo on Android`) to stage and commit your changes +1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fix header logo on Android`) to stage and commit your changes 1. `git push my-fork-name the-name-of-my-branch` 1. Go to the [reactjs.org repo](https://github.com/reactjs/reactjs.org) and you should see recently pushed branches. 1. Follow GitHub's instructions. From 957f0b3a4067a9ba46d1ffda898658925ffa0549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?George=20V=C3=A9ras=20Valentim?= Date: Mon, 3 Jun 2019 22:37:16 -0300 Subject: [PATCH 2/3] Remove outdated link to React FAQ website (#2043) * Add canonical url to the head * Renaming ogUrl to canonicalUrl * Changing home page canonical url * Rename the createOgUrl.js file to createCanonicalUrl.js * Updating ogUrl name and usage (now canonicalUrl) * Add canonicalUrl to TitleAndMetaTags component on pages where it was missing * Adding missing trailing slashes * Remove deprecated link to React FAQ webpage --- content/community/articles.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/community/articles.md b/content/community/articles.md index 53586fe30..a18335975 100644 --- a/content/community/articles.md +++ b/content/community/articles.md @@ -12,5 +12,4 @@ permalink: community/articles.html - [You're missing the point of React](https://medium.com/@dan_abramov/youre-missing-the-point-of-react-a20e34a51e1a) - Dan Abramov's article about the best parts of React. - [Timeline for Learning React](https://daveceddia.com/timeline-for-learning-react/) - Dave Ceddia's recommended timeline for learning React and the React ecosystem. - [Simple React Development in 2017](https://hackernoon.com/simple-react-development-in-2017-113bd563691f) - Joshua Comeau's guide to showcase how easy it can be to start modern React development. -- [React FAQ](https://reactfaq.site/) - An external site with articles that try to answer frequently asked questions about React. - [Visual Guide to State in React](https://daveceddia.com/visual-guide-to-state-in-react/) - Dave Ceddia's visual guide to React state. From 37442ae65eeddb0f3f737a8e4a2a9df103264f9f Mon Sep 17 00:00:00 2001 From: Taehwan Noh Date: Thu, 6 Jun 2019 00:39:46 +0900 Subject: [PATCH 3/3] Resolve merge conflict Related to ca9dc1c --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index b85f433d0..b35a17191 100644 --- a/README.md +++ b/README.md @@ -49,11 +49,7 @@ ### Push 하기 -<<<<<<< HEAD -1. `git add -A && git commit -m "My message"` (`My message` 부분을 `Fixed header logo on Android` 같은 커밋 메시지로 교체)를 실행하여 변경한 파일들을 commit 해주세요. -======= -1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fix header logo on Android`) to stage and commit your changes ->>>>>>> 957f0b3a4067a9ba46d1ffda898658925ffa0549 +1. `git add -A && git commit -m "My message"` (`My message` 부분을 `Fix header logo on Android` 같은 커밋 메시지로 교체)를 실행하여 변경한 파일들을 commit 해주세요. 1. `git push my-fork-name the-name-of-my-branch` 1. [reactjs.org repo](https://github.com/reactjs/reactjs.org)에서 최근에 푸시된 브랜치를 볼 수 있습니다. 1. Github 지침을 따라주세요.