Skip to content

Also fix indentation if no conflicts occurred #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaPePeR wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Also fix indentation if no conflicts occurred #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bin/composer-git-merge-driver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,13 +226,13 @@ if (count($conflicts)) {
$parts[] = str_repeat('>', $markerLen);
return implode("\n", $parts);
}, $merged);
}

// fix the indentation per the user's preference
if ($indentation !== $defaultIndentation) {
$merged = preg_replace_callback("/^(?:{$defaultIndentation})+/m", function($matches) use ($indentation) {
return str_repeat($indentation, strlen($matches[0]) / 4);
}, $merged);
}
// fix the indentation per the user's preference
if ($indentation !== $defaultIndentation) {
$merged = preg_replace_callback("/^(?:{$defaultIndentation})+/m", function($matches) use ($indentation) {
return str_repeat($indentation, strlen($matches[0]) / 4);
}, $merged);
}

// update the file
Expand Down