Skip to content

Instantly share code, notes, and snippets.

@donquixote

donquixote/gist:cb8b39d06a2e4d06adbc221968019c65

Created May 21, 2024 18:22
Show Gist options

  • Select an option

    Learn more about clone URLs
  • Save donquixote/cb8b39d06a2e4d06adbc221968019c65 to your computer and use it in GitHub Desktop.

Select an option

Learn more about clone URLs
Save donquixote/cb8b39d06a2e4d06adbc221968019c65 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. donquixote created this gist May 21, 2024.
    14 changes: 14 additions & 0 deletions gistfile1.txt
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,14 @@
    #!/usr/bin/php
    <?php

    if (!is_file('composer.lock')) {
    print "File 'composer.lock' not found.\n";
    exit(1);
    }

    $orig = file_get_contents('composer.lock');
    $cleaned = preg_replace(
    …}

    print "Trivial merge conflicts removed in 'composer.lock'. Writing to composer.lock. Please run composer update --lock!\n";
    file_put_contents('composer.lock', $cleaned);