Understanding Git Branches & Merge to main

Git branches are essential for organizing development tasks. To create a new branch, use the following command:

bash

git checkout -b feature/add-to-cart

This creates a new branch named feature/add-to-cart and switches to it.

Creating and Working on Feature Branches:

After making changes, stage and commit them using:

git add .

git commit -m "Implemented add to cart functionality"

To push the branch and changes to the remote repository:

git push origin feature/add-to-cart

Create a Pull Request from feature/add-to-cart to main on your Git hosting service.

Review and Merging Workflow:

Reviewers will provide feedback and approvals through the Pull Request interface.

Once approved, merge the branch into main using the merge button on the Pull Request page.

Post-Merge Actions:

Update your local main branch to reflect the merged changes:

git checkout main

git pull origin main

Optionally, delete the feature branch both locally and remotely:

git branch -d feature/add-to-cart

git push origin --delete feature/add-to-cart

Best Practices and Considerations:

Always sync your local repository with remote changes before creating a new branch.

Ensure your branch is up-to-date with the main branch to avoid conflicts during merging.