Skip to content
TheChatArchiveThe Chat Archive
composer-2.5· unknownHugging Face ibragim-bad/swe_rebench_07_2026_trajectories

marimo edit --watch messes with merge conflict markers Describe the bug When…

  1. User

    marimo edit --watch messes with merge conflict markers

    Describe the bug

    When cherry-picking commits, or git stash poping, sometimes merge conflicts occur.

    If a notebook is open using marimo edit --watch during that time, it parses the git conflict markers as app._unparsable_cell. This gets in the way of resolving the conflicts using conflict resolution tools like git-mediate

    Suggestion: Avoid updating the notebook if the file contains conflict markers, recognizable by <<<<<<< at the beginning of a line.

    Will you submit a PR?

    • Yes

    Environment

    {
      "marimo": "0.23.6",
      "editable": false,
      "location": "/Users/yairchu/dev/soundradix/Drum3D/.venv/lib/python3.13/site-packages/marimo",
      "OS": "Darwin",
      "OS Version": "25.2.0",
      "Processor": "arm",
      "Python Version": "3.13.1",
      "Locale": "C/en_US",
      "Binaries": {
        "Browser": "140.0.7339.134",
        "Node": "v23.11.0",
        "uv": "0.7.12 (dc3fd4647 2025-06-06)"
      },
      "Dependencies": {
        "click": "8.4.0",
        "docutils": "0.22.4",
        "itsdangerous": "2.2.0",
        "jedi": "0.19.2",
        "markdown": "3.10.2",
        "narwhals": "2.21.2",
        "packaging": "26.2",
        "psutil": "7.2.2",
        "pygments": "2.20.0",
        "pymdown-extensions": "10.21.3",
        "pyyaml": "6.0.3",
        "starlette": "1.0.0",
        "tomlkit": "0.15.0",
        "typing-extensions": "4.15.0",
        "uvicorn": "0.47.0",
        "websockets": "16.0"
      },
      "Optional Dependencies": {
        "altair": "6.1.0",
        "anywidget": "0.11.0",
        "loro": "1.10.3",
        "pandas": "3.0.3"
      },
      "Experimental Flags": {}
    }
    

    Code to reproduce

    No response

    Interface

    No new interfaces are introduced.

  2. Assistant

    I'll find where marimo edit --watch reloads notebooks and add a guard to skip updates when git conflict markers are present.

  3. Assistant

    Implementing a conflict-marker check before reload and adding tests.

  4. Assistant

    The test failed because conflict markers were indented inside the cell; git puts them at column 0. Updating the test to match that.

  5. Assistant

    Implemented a fix for marimo edit --watch interfering with git merge conflict resolution.

    Problem: When a notebook on disk gets git conflict markers (<<<<<<<, etc.), the file watcher reloads and parses the broken file. Syntax errors fall back to the scanner, which turns content into app._unparsable_cell entries and disrupts tools like git-mediate.

    Fix: Skip reload when the file contains merge conflict markers. A line starting with <<<<<<< is treated as a conflict marker (standard git format).

    1. has_merge_conflict_markers() in marimo/_utils/files.py — detects conflict markers at line start.

    2. FileChangeCoordinator in marimo/_session/file_change_handler.py — reads the file before reload and skips if conflict markers are present, leaving the in-memory notebook unchanged.

    3. Tests — unit tests for the detector and an integration test confirming the coordinator does not reload or mutate state when conflict markers are present.

    When conflicts are resolved and markers are removed, the next file change will reload normally.

Responses were produced in different, uncontrolled contexts (system prompts, settings, prior turns). This is not a benchmark.