How does the merge process work, and what options are available to resolve conflicts?

The merge process combines two branches, with options to handle translations, keys, languages, and conflicts.

Merge in Console #️⃣

You can merge branches using the web interface in Console.

1. Select the branches you want to merge.
2. Configure the merge process to include new languages, files or keys.
3. Pick your conflict resolution strategy - automatic or manual.
4. Resolve conflicts if necessary
5. Perform merge!

Merge options #️⃣

You have the following checkbox options that will affect what will be merged and how:

• Process only conflicting translations
• Create new keys and translations in the target branch
• Create new files in the target branch
• Create new languages in the target branch
• Skip all keys with existing translations
• Deprecate keys missing in the source branch

Conflict Resolution #️⃣

There are many ways to resolve the conflicts that arise during the merge process. You can resolve conflicts automatically or manually.

Learn more about Merging branches

Merge with CLI #️⃣

• Merge command: Use localazy branch merge [options] {source_branch} {target_branch} to perform a merge.
• Conflict resolution: Localazy provides strategies such as --source, --target, and --time to resolve conflicts. For example, using the --strategy source option applies translations from the source branch to resolve conflicts.
• Analysis before merging: Run localazy branch analyze [options] {source_branch} {target_branch} to analyze potential conflicts or failures.
• Conflict handling: Use commands like localazy branch conflicts and options such as --no-fail-on-conflicts to manage the process smoothly.

You can learn more in the CLI Docs: Branching