From 36b3aea758eec7bf3e85aaa81fff3d207bc671cb Mon Sep 17 00:00:00 2001 From: Daniel James Smith Date: Thu, 16 Dec 2021 14:38:11 +0100 Subject: [PATCH] Update README.md (#586) * Update README.md * Replace header Git diff with Git blame --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 95529e3fbc8..ce5cb1f15fb 100644 --- a/README.md +++ b/README.md @@ -24,12 +24,12 @@ We recently migrated to using Prettier as code formatter. All previous branches 1. Check out your local Branch 2. Run `git merge 8b2dfc6cdcb8ff5b604364c2ea6d343473aee7cd` 3. Resolve any merge conflicts, commit. -4. Run `npm prettier` +4. Run `npm run prettier` 5. Commit 6. Run `git merge -Xours 193434461dbd9c48fe5dcbad95693470aec422ac` 7. Push -### Git diff +### Git blame We also recommend that you configure git to ignore the prettier revision using: