Welcome to the tasks! This guide will help you follow the Git workflow to keep everything organized and ensure smooth collaboration.
- Workflow Overview
- Setup Instructions
- Creating a New Feature
- Directory Structure
- Submitting Your Work
- Pull Request Workflow
To maintain an organized codebase, we follow a Git branching strategy where each team member will work in their own directory. The general steps are:
- Create a feature branch from the
main
branch (e.g.,feature/username
). - Work on your code in your own directory (e.g.,
username/
). - Make commits to your feature branch.
- Push your branch to GitHub.
- Create a Pull Request (PR) to merge your changes into
main
. - Review and merge PR after review.
- Pull the latest changes from
main
to keep your local repository up-to-date.
-
Clone the repository to your local machine:
git clone https://github.com/yourusername/your-repo.git cd your-repo
-
Make sure you're on the
main
branch:git checkout main
-
Pull the latest changes from
main
:git pull origin main
-
Create a new branch from
main
for your feature:git checkout -b feature/username
Replace
username
with your GitHub username or a descriptive name for your feature. -
Work on your code in your specific directory (
username/
). For example:├── username/ │ ├── index.html │ ├── portfolio.css │ └── portfolio.js
-
Make commits to your feature branch:
git add . git commit -m "Added new portfolio page"
-
Push your branch to GitHub:
git push origin feature/username
Each team member has their own directory where they will work. The structure will look something like this: