From b316be648955e007a3c763739d882343e422293b Mon Sep 17 00:00:00 2001 From: Devika U H <84021890+Devika0713@users.noreply.github.com> Date: Tue, 5 Oct 2021 16:13:28 +0530 Subject: [PATCH] Update README.md Hello the live website link seemed to not be working so I fixed it and also made a few more minor changes(I added relevant emojis in front of avoid conflicts and FAQ section) The website however looks really amazing!! --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ba6ecf86f3..44fd3b607b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Hacktoberfest ([Live Website](https://fineanmol.github.io/Hacktoberfest2k21/Contributors.html)) +# Hacktoberfest ([Live Website](https://fineanmol.github.io/Hacktoberfest2021/Contributors.html)) **This is a beginner-friendly project to help you get started with your [hacktoberfest](https://hacktoberfest.digitalocean.com/). If you don't @@ -10,14 +10,14 @@ P.S. Star โญ and Share this repository, if you had fun!! ๐Ÿ˜ ![Hacktoberfest 2021](https://hacktoberfest.digitalocean.com/_nuxt/img/logo-hacktoberfest-full.f42e3b1.svg) -# ๐Ÿ“Œ Videos +# ๐Ÿ“Œ Videos : - [Hacktoberfest Intro](https://youtu.be/OsAFX_ZbgaE) - [How to pull request [Overview]](https://youtu.be/DIj2q02gvKs) - [Merge Conflict / comment](https://youtu.be/zOx5PJTY8CI) -# Contribution rules๐Ÿ“š +# Contribution rules๐Ÿ“š : - The project must work when opening Contributors.html - You are allowed to make pull requests that break the rules. We just merge it ;) @@ -28,7 +28,7 @@ P.S. Star โญ and Share this repository, if you had fun!! ๐Ÿ˜ - Try to keep pull requests small to minimize merge conflicts -## Getting Started ๐Ÿค— +## Getting Started๐Ÿค— : - Fork this repo (button on top) - Clone on your local machine @@ -64,7 +64,7 @@ git push origin my-new-branch - Create a new pull request from your forked repository -## Avoid Conflicts (Syncing your fork) +## Avoid Conflicts (Syncing your fork)๐Ÿ’ก : An easy way to avoid conflicts is to add an 'upstream' for your git repo, as other PR's may be merged while you're working on your branch/fork. @@ -87,7 +87,7 @@ This will give you any eventual conflicts and allow you to easily solve them in For more information on syncing forks [read this article from Github](https://help.github.com/articles/syncing-a-fork/). -# FAQs +# FAQs ๐Ÿ’ฌ : - Who can contribute? - Anyone with a github account and who is signed up for