Skip to content

Contribution

Valeh ASADLI edited this page Nov 1, 2023 · 2 revisions

Hello! Let's dive into some essential terms and practices in version control.

Terms/Rules

  1. Feature: A new functionality or enhancement introduced to the application.

Explanation: Features are typically new capabilities or improvements that are added to the software, often based on user feedback or business requirements.

  1. Development: The branch where all the new features, improvements, and changes are made.

Explanation: This is the main working branch, where developers collaborate to build and test new code.

  1. Release: The branch that prepares the code to be launched or deployed to a staging or pre-production environment.

Explanation: Releases are essentially the finalized versions of the software, ready to be tested in a production-like environment before the actual deployment.

  1. Hotfix: A branch dedicated to quickly address and fix urgent bugs or issues in the production environment.

Explanation: Hotfixes are immediate solutions to pressing problems, bypassing the usual development and testing process to provide a rapid fix.

  1. Master (Production): The branch that reflects the current code running in the production environment.

Explanation: This is the 'live' version of the software that end-users interact with.


How to create a new feature:

  1. Checkout the development branch: git checkout development
  2. Create a new feature branch: git checkout -b feature/your-feature-name

How to create a hotfix:

  1. Checkout the master branch: git checkout master
  2. Create a new hotfix branch: git checkout -b hotfix/your-hotfix-name Remember, after making changes in any branch, always commit your changes and then push the branch to the remote repository for collaboration and further action. Happy coding!

Clone this wiki locally