Conflict Resolution Guide

Conflict Resolution Guide

What Are Conflicts?

Conflicts happen when the same file is edited in two different places before they can sync.

Common situations:

• You edit a file on your laptop
• Someone else edits the same file on their computer
• Both try to sync - conflict detected!

How Ogresync Handles Conflicts

Ogresync uses a simple 2-step process to fix conflicts safely:

Step 1: Choose Your Strategy

When conflicts happen, you get three options:

Smart Merge - Try to combine both versions automatically

• Works well when changes don't overlap
• Ogresync figures out what to keep from each version

Keep Local - Use your version

• Keeps the changes you made
• Discards the other person's changes

Keep Remote - Use their version

• Keeps the other person's changes
• Discards your changes

Step 2: Review Individual Files

If Smart Merge can't handle everything automatically:

• You'll see a list of files that need attention
• Click on each file to see both versions
• Choose which parts to keep from each version

Conflict Resolution Window

When conflicts need your attention, Ogresync opens a simple window showing:

Left Side: Your Version

• Shows your changes
• Highlights what you added/changed

Right Side: Their Version

• Shows the other person's changes
• Highlights what they added/changed

Bottom: Merged Result

• Shows the final version after you make choices
• Updates as you select which parts to keep

Making Choices

• Click sections to choose which version to keep
• Green = keeping this part
• Red = removing this part
• Edit the merged result directly if needed

Tips for Avoiding Conflicts

Best Practices:

1. Sync Often - Don't let changes pile up
2. Communicate - Let teammates know when you're editing shared files
3. Work on Different Files - Avoid editing the same file simultaneously
4. Use Branches - For major changes, create separate branches

Smart Editing:

• Edit different sections of the same file
• Add comments about what you're changing
• Make smaller, focused edits rather than big changes

What If Something Goes Wrong?

Don't Panic! Ogresync creates backups before making changes.

Finding Backups

Look in your synced folder for:

• _ogresync_backups/ folder
• Files are named with timestamps
• Multiple versions are kept

Restoring from Backup

1. Find the backup file with the right timestamp
2. Copy it back to your main folder
3. Rename it to remove the backup timestamp
4. Let Ogresync sync the restored version

Complete Reset

If everything gets messed up:

1. Stop Ogresync
2. Copy your important files somewhere safe
3. Delete the .git folder in your synced directory
4. Run Ogresync setup again
5. Copy your files back and let it sync

Common Conflict Scenarios

Scenario 1: Different Sections

Problem: You edit the top of a file, someone else edits the bottom Solution: Smart Merge usually handles this automatically

Scenario 2: Same Paragraph

Problem: Both people edit the same paragraph Solution: Review both versions and choose the best parts

Scenario 3: File Deleted vs Modified

Problem: You delete a file, someone else modifies it Solution: Choose whether to restore the file or keep it deleted

Scenario 4: Lots of Changes

Problem: Many files have conflicts Solution: Take your time, handle them one by one

Getting Help

Still Confused?

• Check the FAQ for quick answers
• Look at Troubleshooting for common problems
• Ask questions in the GitHub discussions

Remember: Conflicts are normal when multiple people work on the same files. Ogresync makes them safe and easy to handle!