Workflow

[Ayshyama]

Workflow

1. First we take a big task, will call it 'epic', from Backlog.
2. We split it on Todo board to a 'sprint' for week or 2-3 weeks.
3. Then open a new branch for each new task (e.g. Authentification which include back and front).
4. Back and frontend work together on the task in the same branch.
5. You need to check updates for your branch if there is something to pull.
6. When you complete your work (some subtasks or full task) - push updates.
7. When you comple the full task - make pull request.
8. Finally we merge working branch with master branch

Meetings

When we start our Workflow we can make a meeting schedule like this:

1. End of the week - 1 hour meeting to check what is done and plan next week.
2. Everyday morning call - 10 minute logs.

Git

• Fork and clone, or just clone the project

• If you want fork, then after clone use:
  git remote add upstream <link>
  to add the original repository as a remote repository, this will allow you to get updates from the original repository if they become available.

• Add remote origin (if you need):
  git remote add origin <link>

• HINT:
  Origin: This is your fork of the original project.
  Upstream: This is the original project that you forked.

How to pull updates:

• Fetching will retrieve objects and refs from the remote repository but won't automatically checkout or merge anything.
  git fetch upstream

• If you also want to fetch from the origin, you can do:
  git fetch origin

• to fetch changes from the upstream repository and merge them into your current local branch all in one step
  git pull upstream branch_name

How to push updates:

• Select your working branch
  git checkout your-branch

• or create a new branch
  git checkout -b your-branch

• Use push
  git push upstream your-branch

• or
  git push origin your-branch