Skip to content

Recorded the behaviour of commit message when conflict are auto resolved #9414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 29, 2025
Merged

Recorded the behaviour of commit message when conflict are auto resolved #9414

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4af4366
Recorded the behavior of commit message when conflict are auto resolv…
raghuveer-singh-mendix Apr 22, 2025
ed4e572
Merge branch 'mendix:development' into commit-message-during-auto-merge
raghuveer-singh-mendix Apr 23, 2025
d952062
Review
MariaShaposhnikova Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...refguide/version-control/using-version-control-in-studio-pro/merge-algorithm.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,12 @@ Your work is now labelled *Theirs*, while the server changes are labelled *Mine*

{{< figure src="/attachments/refguide/version-control/using-version-control-in-studio-pro/merge-algorithm/Steps/Rebase_Step_1.png" width="525" >}}

When merge conflicts are automatically resolved, Studio Pro adds a **#Conflicts** tag to the commit message. The **#Conflicts** tag in Studio Pro serves as a smart indicator, highlighting files that encountered conflicts during the rebase process. This feature is particularly valuable as it maintains a record of auto-merged conflicts, giving developers clear insight into the merge history.
Key benefits of this approach are the following:
* Transparency – It clearly shows which files required conflict resolution.
* Efficiency – Auto-merging saves time while still flagging areas for review.
* Traceability – It maintains conflict history to support code reviews and troubleshooting.

#### Resolving the First Conflict{#resolving-first-conflict}

Git tries to apply your first commit (`#3`) to the top of the rebasing branch (*Mine*). The commit will come after commit `#4`.
Expand Down