Conversation
README.md
Outdated
| 4. Switch to a new branch using ***git checkout -b branch name*** | ||
| > Note! Before creating a new branch read section [Branches](#branches) |
There was a problem hiding this comment.
In my opinion, this point is about the development of a new feature, and not about work. I think it's better to move this to the paragraph about branches.
README.md
Outdated
|
|
||
| ## REPO: how to work | ||
|
|
||
| ### How to work localy: |
There was a problem hiding this comment.
How to start working locally
README.md
Outdated
| 1. Switch to the ***develop*** branch on your local version. | ||
| 2. You have to pull all origin version changes, use command ***git pull origin develop***. | ||
| 3. Resolve all required conflicts. | ||
| 4. Create and switch to a new branch only from ***develop*** branch. |
There was a problem hiding this comment.
flow next:
git checkout develop
git pull
git checkout -b task-name
work with task
before push result of your work you need merge last version of develop
git commit -m 'commit mesage'
git checkout develop
git pull
git checkout task-name
git pull origin develop
// if you have merge conflict you will solve them
git push origin task-name
|
|
||
| Branch ***main*** is empty exept for README.md! | ||
| There will be a finished version of the project in ***main*** branch at the end after all agreements and merges. | ||
|
|
There was a problem hiding this comment.
After each sprint develop branch will merge in main. Main will include result of every sprint.
| > 1. Task's name. | ||
| > 2. If there is an UI, add a screenshot. | ||
| > 3. Add a small description regarding your responsibilities for the task, for example: add a backlog section, add UI or just create project's readme. | ||
| > 4. Date regarding task's start and finish. |
There was a problem hiding this comment.
okay, fixed
README.md
Outdated
|
|
||
| ### After origin version changes | ||
|
|
||
| After all origin merges you have to pull changes into your local version. Read steps 1-3 in [branches section](#branches), then switch to your task's branch and merge develop branch to the current choosen branch (***git merge develop***) and resolve conflicts if it's required. |
There was a problem hiding this comment.
If you change paragraph about branches you will chang this text too.
✅ Deploy Preview for project-management-app-team53 ready!
To edit notification comments on pull requests, go to your Netlify site settings. |
2 participants
Task: add a knowledge base for project.
