launchpad-reviewers team mailing list archive

[Kristian Glass <kristian.glass@xxxxxxxxxxxxx>]

Review: Approve

On the basis of "we have this, let's fix it minimally to make it work for now", +1

I suspect longer-term we want `git diff --check` rather than a DIY grep - from the man page:

```
       --check
           Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by
           core.whitespace configuration. By default, trailing whitespaces (including lines that solely consist of whitespaces) and a space
           character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors.
           Exits with non-zero status if problems are found. Not compatible with --exit-code.
```
-- 
https://code.launchpad.net/~cjwatson/launchpad/conflict-marker-test-git/+merge/373153
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/conflict-marker-test-git into lp:launchpad.