Skip to main content

Git Flow Context

Git Flow Context

In the context of Git Flow, a popular branching model for managing Git branches, the roles of tags and branches are clearly defined:

Branches:

Main Branches:

main (or master): The main branch where the source code of HEAD always reflects a production-ready state.

develop: The branch where the latest development happens. This branch contains the complete history of the project, whereas the main branch contains an abridged version.

Supporting Branches:

Feature Branches: Used to develop new features. Typically created off the develop branch and merged back into develop.

git switch -c feature/<feature-name> develop

Release Branches: Used to prepare a new production release. Created from develop and merged into both main and develop.

git switch -c release/<version> develop

Hotfix Branches: Used to quickly fix production issues. Created from main and merged back into both main and develop.

git switch -c hotfix/<description> main


Tags:

Release Tags: Used to mark specific points in the history as releases. For example, when a release branch is finished and merged into main, a tag is created to denote this release.

git tag -a v1.0.0 -m "Release version 1.0.0"

git push origin v1.0.0

 

Summary

Tags:

  • Used for marking specific points in the repository’s history (e.g., releases).
  • Immutable and static.
  • Typically used to denote version releases.

Branches:

  • Used for ongoing development work and creating separate lines of development.
  • Mutable and dynamic.
  • Essential for collaborative workflows, allowing multiple people to work on different tasks simultaneously.
  • Understanding the differences and appropriate use cases for tags and branches is crucial for effective Git workflow management. 

Comments

Post a Comment

Popular posts from this blog

Apache Storm vs Apache Flink

 Apache Storm and Apache Flink are both distributed stream processing frameworks, but they have some key differences in terms of architecture, programming models, and features. Here's a comparison between Apache Storm and Apache Flink: 1. **Programming Model:**    - **Apache Storm:** Storm provides a low-level, event-driven programming model using spouts and bolts. Spouts are sources of data, and bolts are the processing units that apply transformations or analyses to the data. It is designed for building complex, directed acyclic graphs (DAGs) of processing stages.        - **Apache Flink:** Flink offers a more high-level and expressive API for stream processing. Flink's API includes a functional programming style using operations like map, flatMap, filter, and windowing operations, making it easier to express complex data transformations. 2. **Event Time Processing:**    - **Apache Storm:** Initially, Storm had challenges in handling event ...
Post a Comment
Read more

Shell Scripts

Shell scripts $? variable: In a shell script, we can check the return status immediately after running any command to determine if command is successful or not. like echo $? if return status is 0, it indicates success,  and if the return status is non-zero, typically 1, means failure. /dev/null /dev/null is a special device file in Unix-like operating systems (including Linux) that discards all data written to it. It essentially acts as a black hole for data. When data is written to /dev/null, it simply disappears and does not consume any storage space. Here are some common use cases for /dev/null: Discarding Output: As mentioned earlier, redirecting output to /dev/null is a common way to discard unwanted output, such as diagnostic messages or verbose output, especially when running scripts or commands in the background where you don't need to see the output. command >/dev/null  # Redirects stdout to /dev/null command 2>/dev/null # Redirects stderr to /dev/null command ...
Post a Comment
Read more

Recover lost files on Windows, free and effective

 Windows File Recovery If necessary, download and launch the app from Microsoft Store. Press the Windows key, enter Windows File Recovery in the search box, and then select Windows File Recovery. When you are prompted to allow the app to make changes to your device, select Yes. In the Command Prompt window, enter the command in the following format:  winfr source-drive: destination-drive: [/mode] [/switches] There are 2 basic modes you can use to recover files: Regular and Extensive.  Regular mode examples Recover your Documents folder from your C: drive to the recovery folder on an E: drive. Don’t forget the backslash (\) at the end of the folder.   winfr C: E: /regular /n \Users\<username>\Documents\  Recover PDF and Word files from your C: drive to the recovery folder on an E: drive.  winfr C: E: /regular /n *.pdf /n *.docx  Extensive mode examples   winfr E: C: /extensive /n *invoice*  Recover jpeg and png photos from your...
Post a Comment
Read more