Skip to content

Implement 3-way merge - #343

Merged
aivanovski merged 14 commits into
masterfrom
feature/add-merge-conflict-resolution
Aug 17, 2026
Merged

aivanovski merged 14 commits into
masterfrom
feature/add-merge-conflict-resolution

Conversation

@aivanovski

Copy link
Copy Markdown
Owner

No description provided.

@aivanovski aivanovski linked an issue Aug 13, 2026 that may be closed by this pull request

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1b7af17bbb

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@aivanovski aivanovski changed the title Implement 3-way merge; Refactor some File System entities from Java to Kotlin Implement 3-way merge Aug 14, 2026
@aivanovski aivanovski added this to the 2.1.0 milestone Aug 17, 2026
@aivanovski
aivanovski merged commit ca8e120 into master Aug 17, 2026
8 checks passed
@aivanovski
aivanovski deleted the feature/add-merge-conflict-resolution branch August 17, 2026 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[FEATURE] Add "Merge" button to conflict dialog

1 participant