Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Apple's Git and Homebrew's Git sometimes disagree about hunk headers. Homebrew's Git is newer and closer to other platform's versions of Git, so we prefer it.
After installing Homebrew's Git, I ran
yarn run init
andyarn run update_patches
(without having made any changes to the Chromium source). There is one file with a hunk header change, because I resolved a merge conflict that was created in9f292d21
because @bbondy was using Homebrew's Git while I was using Apple's Git.I will update the wiki to recommend developers using macOS install git from Homebrew.
Submitter Checklist:
git rebase -i
to squash commits (if needed).Test Plan:
yarn run init
yarn run update_patches
There should be no bogus changes to the hunk headers in any of the patch files.
Reviewer Checklist: