From b014ebd8a506a4c37352d502a13188ac701bc527 Mon Sep 17 00:00:00 2001 From: Nik <116043993+NIKaragu@users.noreply.github.com> Date: Fri, 13 Sep 2024 16:26:47 +0300 Subject: [PATCH] Update README.md --- README.md | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 40e51cd..203741b 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,22 @@ -## How to add/push/commit: -1. git add ./src -2. git commit -m '' -3. git push origin +## How to name your branches: +>- If you create new feature for project you should name you branch as 'feauture/`your task name`' +>- If you wanna do a bugfix of some feature you should create a new brunch from a related 'feauture/`your task name`' and name it as 'bugfix/`your task name`'. +>After successful bugfix you have to create a pull request like '`feauture/your task name <- bugfix/your task name`' and merge it with a related 'feauture/`your task >name`' after a review. -## Create a pull request after your pushing +## Before starting +>1. git checkout develop +>2. git pull +>3. git checkout -b `your branch name` +## How to add/push/commit: +>1. git add ./src +>2. git commit -m '`your message`' +>3. git push origin '`your branch name`' +>4. Create pull request +>5. After a review your branch will be merged with `develop branch` + ## Instructions -- Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save. -- Replace `` with your Github username in the [DEMO LINK](https://.github.io/react_redux-list-of-todos/) -- Follow the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline) +>- Install Prettier Extention and use this [VSCode settings](https://mate-academy.github.io/fe-program/tools/vscode/settings.json) to enable format on save. +>- Replace `` with your Github username in the [DEMO LINK](https://.github.io/react_redux-list-of-todos/) +>- Follow the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline)