--- title: Use Git Properly in biGENIUS-X description: "biGENIUS fully supports Git-based collaboration, enabling teams to work efficiently, transparently, and in a structured way.\nTo keep development stable and consistent, it’s essential to follow a clear workflow.\nThis workflow is explained in the article Understand Git Workflow in biGENIUS-X." --- [Skip to content](https://knowledge.bigenius-x.com/use-git-properly-in-bigenius-x#main-content) [Contact us](https://knowledge.bigenius-x.com/kb-tickets/new?hsLang=en) [Go to Customer Portal](https://knowledge.bigenius-x.com/customer-portal?hsLang=en) [![TRI\_Logo\_biGENIUS\_2020\_RGB\_s](https://knowledge.bigenius-x.com/hs-fs/hubfs/Marketing/TRI_Logo_biGENIUS_2020_RGB_s.png?width=150&height=42&name=TRI_Logo_biGENIUS_2020_RGB_s.png)](https://www.bigenius-x.com/) Open main navigation Close main navigation - [Contact us](https://knowledge.bigenius-x.com/kb-tickets/new) - [Go to Customer Portal](https://knowledge.bigenius-x.com/customer-portal) How can we help you? - There are no suggestions because the search field is empty. 1. [biGENIUS-X Knowledge Base](https://knowledge.bigenius-x.com/?hsLang=en) 2. [Application Modules](https://knowledge.bigenius-x.com/application-modules?hsLang=en) 3. [Branches](https://knowledge.bigenius-x.com/application-modules?hsLang=en#branches) # Use Git Properly in biGENIUS-X biGENIUS fully supports Git-based collaboration, enabling teams to work efficiently, transparently, and in a structured way. To keep development stable and consistent, it’s essential to follow a clear workflow. ![](https://knowledge.bigenius-x.com/hs-fs/hubfs/image-png-Jul-30-2024-12-33-03-5718-PM.png?width=670&height=211&name=image-png-Jul-30-2024-12-33-03-5718-PM.png) This workflow is explained in the article [Understand Git Workflow in biGENIUS-X](https://knowledge.bigenius-x.com/understand-git-workflow?hsLang=en). ### Core Principle: Working with Feature Branches Each user works in their own Feature Branch, which is created from the Main Branch. This ensures that all changes are isolated and only merged into Main after proper review and approval. **Workflow:** 1. **Create a Feature or HotFix Branch**: 1. Always create: 1. The Feature Branch from the Main 2. The HotFix Branch from the Release Branch to correct 2. Use a meaningful Branch name, so it’s clear which user story or feature is being implemented (e.g., *feature/add-product-api* or *bugfix/fix-order-validation*) 2. **Implement the feature**: 1. Work on your assigned user story or bug fix in your Branch 2. Keep Branches focused – one Branch per user story, feature, or bug fix 3. **Create a Pull Request into Main**: 1. Once the work is complete, create a Pull Request (PR) into Main 2. After review and approval, the Branch is merged into Main 4. **Start the next feature**: 1. For the next task, create a new Feature Branch again from Main Feature Branches should be **short-lived** and **deleted** after the Pull Request is completed. ### Deployment and Releases Feature Branches can be used for deployment to the development environment. Once all relevant features are ready, a Release Branch should be created from Main. This Release Branch can then be deployed to test and/or production. ### Keeping Your Branch Up to Date To stay aligned with the latest changes, regularly update your branch. In biGENIUS-X, use “Rebase from main” to pull in the newest commits. This ensures your branch is consistent with the current project state. ### Handling Bugs When a bug occurs, there are two recommended options: #### Option 1: Fix from Main Create a new Feature Branch from Main. Implement the fix and merge it back into Main. Afterwards, use cherry-pick (e.g. in Azure DevOps) to apply the fix to the Release Branch. #### Option 2: Fix from Release In biGENIUS, create a Hotfix Branch from the Release Branch. Fix the issue and merge the hotfix back into the Release Branch. **Important**: Always cherry-pick the fix back into Main afterwards. Cherry-picking is critical to keep all Branches in sync — just as in other professional software projects. ### Merge Conflicts If a merge or rebase conflict occurs, resolve the conflict manually in your Git tool (e.g. VS Code). Then validate your project in biGENIUS-X or using the VS Code biGENIUS-X Extension (via the Validate function). If the validation fails, recheck and fix the merge conflict before continuing. ### Key Takeaways - Everyone works in their own Feature Branch for their assigned user story. - After completion: Create a Pull Request into Main. - Bugfixes must always be cherry-picked between Branches. - Regularly rebase from Main to stay up to date. - Resolve and validate merge conflicts before merging   - [Getting started](https://knowledge.bigenius-x.com/getting-started?hsLang=en#main-content) - [Guidelines](https://knowledge.bigenius-x.com/getting-started?hsLang=en#guidelines) - [Start working](https://knowledge.bigenius-x.com/getting-started?hsLang=en#start-working) - [Account](https://knowledge.bigenius-x.com/getting-started?hsLang=en#account) - [General overview](https://knowledge.bigenius-x.com/general-overview?hsLang=en) - [Artificial Intelligence](https://knowledge.bigenius-x.com/artificial-intelligence?hsLang=en) - [Application Modules](https://knowledge.bigenius-x.com/application-modules?hsLang=en#main-content) - [Administration](https://knowledge.bigenius-x.com/application-modules?hsLang=en#administration) - [Solutions](https://knowledge.bigenius-x.com/application-modules?hsLang=en#solutions) - [Global Features](https://knowledge.bigenius-x.com/application-modules?hsLang=en#global-features) - [Projects](https://knowledge.bigenius-x.com/application-modules?hsLang=en#projects) - [Branches](https://knowledge.bigenius-x.com/application-modules?hsLang=en#branches) - [Data Connections](https://knowledge.bigenius-x.com/application-modules?hsLang=en#data-connections) - [Dataflow Modeling - Overview](https://knowledge.bigenius-x.com/application-modules?hsLang=en#dataflow-modeling-overview) - [Dataflow Modeling - Wizard Steps](https://knowledge.bigenius-x.com/application-modules?hsLang=en#dataflow-modeling-wizard-steps) - [Dataflow Modeling - Terms](https://knowledge.bigenius-x.com/application-modules?hsLang=en#dataflow-modeling-terms) - [Dataflow Modeling - Term Mapping](https://knowledge.bigenius-x.com/application-modules?hsLang=en#dataflow-modeling-term-mapping) - [Dataflow Modeling - Relationships](https://knowledge.bigenius-x.com/application-modules?hsLang=en#dataflow-modeling-relationships) - [Dataflow Modeling - Data Quality](https://knowledge.bigenius-x.com/application-modules?hsLang=en#dataflow-modeling-data-quality) - [Dataflow Modeling - Indexes](https://knowledge.bigenius-x.com/application-modules?hsLang=en#dataflow-modeling-indexes) - [Relationship Modeling](https://knowledge.bigenius-x.com/application-modules?hsLang=en#relationship-modeling) - [Generate Artifacts](https://knowledge.bigenius-x.com/application-modules?hsLang=en#generate-artifacts) - [Project Settings](https://knowledge.bigenius-x.com/application-modules?hsLang=en#project-settings) - [Data Marketplace](https://knowledge.bigenius-x.com/application-modules?hsLang=en#data-marketplace) - [Generators](https://knowledge.bigenius-x.com/generators?hsLang=en#main-content) - [Fabric Warehouse](https://knowledge.bigenius-x.com/generators?hsLang=en#fabric-warehouse) - [Fabric Lakehouse](https://knowledge.bigenius-x.com/generators?hsLang=en#fabric-lakehouse) - [Databricks](https://knowledge.bigenius-x.com/generators?hsLang=en#databricks) - [Snowflake](https://knowledge.bigenius-x.com/generators?hsLang=en#snowflake) - [Microsoft SQL Server](https://knowledge.bigenius-x.com/generators?hsLang=en#microsoft-sql-server) - [Artifacts](https://knowledge.bigenius-x.com/generators?hsLang=en#artifacts) - [Replace Placeholders](https://knowledge.bigenius-x.com/generators?hsLang=en#replace-placeholders) - [Target solution environment](https://knowledge.bigenius-x.com/generators?hsLang=en#target-solution-environment) - [Deployment](https://knowledge.bigenius-x.com/generators?hsLang=en#deployment) - [Deployment with an Azuze DevOps pipeline](https://knowledge.bigenius-x.com/generators?hsLang=en#deployment-with-an-azuze-devops-pipeline) - [Delta Deployment](https://knowledge.bigenius-x.com/generators?hsLang=en#delta-deployment) - [Load control environment](https://knowledge.bigenius-x.com/generators?hsLang=en#load-control-environment) - [Load data with a native load control](https://knowledge.bigenius-x.com/generators?hsLang=en#load-data-with-a-native-load-control) - [Load data with Apache Airflow](https://knowledge.bigenius-x.com/generators?hsLang=en#load-data-with-apache-airflow) - [Model Object Type](https://knowledge.bigenius-x.com/generators?hsLang=en#model-object-type) - [Properties](https://knowledge.bigenius-x.com/generators?hsLang=en#properties) - [Default Terms](https://knowledge.bigenius-x.com/generators?hsLang=en#default-terms) - [Discovery application](https://knowledge.bigenius-x.com/discovery-application?hsLang=en#main-content) - [Discovery configurations](https://knowledge.bigenius-x.com/discovery-application?hsLang=en#discovery-configurations) - [Best practices](https://knowledge.bigenius-x.com/best-practices?hsLang=en#main-content) - [Modeling Approaches](https://knowledge.bigenius-x.com/best-practices?hsLang=en#modeling-approaches) - [Use Cases](https://knowledge.bigenius-x.com/best-practices?hsLang=en#use-cases) - [Business Rules](https://knowledge.bigenius-x.com/best-practices?hsLang=en#business-rules) - [Data Quality Rules](https://knowledge.bigenius-x.com/best-practices?hsLang=en#data-quality-rules) - [FAQs](https://knowledge.bigenius-x.com/faqs?hsLang=en) - [Product Release Notes](https://knowledge.bigenius-x.com/product-release-notes?hsLang=en#main-content) - [SaaS Application](https://knowledge.bigenius-x.com/product-release-notes?hsLang=en#saas-application) - [Discovery application](https://knowledge.bigenius-x.com/product-release-notes?hsLang=en#discovery-application) - [Generators](https://knowledge.bigenius-x.com/product-release-notes?hsLang=en#generators) - [Legal Documents](https://knowledge.bigenius-x.com/legal-documents?hsLang=en#main-content) - [Current legal docs](https://knowledge.bigenius-x.com/legal-documents?hsLang=en#current-legal-docs) - [Software Product and Limits](https://knowledge.bigenius-x.com/legal-documents?hsLang=en#software-product-and-limits) - [Contact us](https://knowledge.bigenius-x.com/kb-tickets/new?hsLang=en) - [Customer Portal](https://knowledge.bigenius-x.com/customer-portal) - [Sign in](https://knowledge.bigenius-x.com/_hcms/mem/login) [![biGENIUS logo](https://knowledge.bigenius-x.com/hubfs/TRI_Logo_biGENIUS_2020_RGB-1.svg "biGENIUS logo")](https://www.bigenius-x.com) All rights reserved © 2025, biGENIUS AG