LogoLogo
v7.0.0
v7.0.0
  • TotalCross Overview
  • TotalCross Javadoc
  • TotalCross Changelog
  • Roadmap
  • Documentation
    • Getting Started
      • First embedded project with TotalCross
    • Components
      • Accordion
      • Aligned Labels
      • Button
      • Check
      • ComboBox
      • Dynamic Scroll
      • Edit
      • Floating Button
      • Gpiod
      • Grid
      • GridContainer
      • Image
      • ImageControl
      • ImageList
      • Label
      • Material Icons
      • Material Window
      • MessageBox
      • Multi Edit
      • Progress Bar
      • Progress Box
      • Radio
      • Radio Group
      • Scroll Container
      • Side Menu
      • Slider
      • Sliding Window
      • Spin List
      • Spinner
      • Switch
      • Tabbed Container
      • Velocimeter
    • APIs
      • API Overview
      • API Rest
      • Asynchronous Task
      • Camera
      • Control
        • Main Window
        • Window
        • Container
      • GPS
      • HTTPS and SSL
      • JSON
      • Maps
        • Maps - Deprecated
        • Static Map
      • Material Design Standards
      • Ninepath
      • Notifications
      • PrinterManager
      • Push Notification Firebase
      • Scanner
      • SOAP
      • Socket
      • SocketServer
      • SQLite Encryption
      • QR Code Generator
      • totalcross.sys
      • Youtube API
    • Creating an Issue
    • Contributing
      • Branch workflow
      • Writing documentation
    • Guides
      • App Architecture
        • Suggested Architecture
        • Why do Design Patterns help with the application's organization?
          • MVC Architecture Pattern
          • Template Pattern
          • Data Persistence: DAO Pattern.
        • Separation of concepts: What is the best way to create UI interfaces?
        • Positioning
          • Manual Positioning
        • Relative Positioning
        • Best practices to improve project maintenance
      • Device Simulator
      • Package your app from scratch
        • TotalCross SDK
        • Environment Variables in IDE
          • Eclipse
          • IntelliJ
        • Deploy your app with a dependecy TC
        • Deploy iOS
          • Using Development certificate to test your apps
      • Understanding TotalCross for Linux ARM
      • Running C++ applications with TotalCross
      • Web Services
    • Miscelaneous
      • Java JDK 8
      • Maven
      • Installing Visual Studio Code
    • FAQ
      • IMEI in Android 10
Powered by GitBook
On this page
  • Types
  • Rebase before merge

Was this helpful?

  1. Documentation
  2. Contributing

Branch workflow

Understand our git workflow

Types

There are some types of branches in our repository, they are:

  • Feature: used to implement new features. Can be started from an issue. Started at the source of the problem (commit) from the source version. The prefix is feature-;

  • Fix: used to fix bugs and code smells. Can be started from an issue. Started at the source of the problem (commit) from the source version. Fix takes precedence over the feature and should be resolved quickly and has the same process. The prefix is: fix-;

  • Hotfix: special branches for cases of emergency corrections, are used to quickly patch production releases. The prefix is hotfix-;

  • Develop: WIP

  • Master: WIP

Rebase before merge

In summary:

  1. Open branch feature-x;

  2. developdoes not stop production ;

  3. Finish feature-x;

  4. Rebase feature-x into develop;

  5. Test integration;

  6. Merge request (delete the branch).

The reasons for this are:

  • Anticipate integration;

  • Maintain a more linear history;

  • Commit squash situation (compile multiples commits in an unique commit).

PreviousContributingNextWriting documentation

Last updated 5 years ago

Was this helpful?