Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[ Tool ] Fix file path conflict introduced in https://github.com/flutter/flutter/pull/169949 #170606

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

Jump to bottom
Merged
merged 1 commit into from
Jun 17, 2025
Merged

[ Tool ] Fix file path conflict introduced in https://github.com/flutter/flutter/pull/169949 #170606

merged 1 commit into from
Jun 17, 2025

Conversation

bkonyi
Copy link
Contributor

@bkonyi bkonyi commented Jun 13, 2025

Was causing the following warning on Git checkout:

warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:

  'packages/flutter_tools/test/data/vscode/application/Resources/app/package.json'
  'packages/flutter_tools/test/data/vscode/application/resources/app/package.json'

@github-actions github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jun 13, 2025
@bkonyi bkonyi requested review from jtmcdole and matanlurey June 13, 2025 18:11
@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 17, 2025
@auto-submit auto-submit bot added this pull request to the merge queue Jun 17, 2025
Merged via the queue into master with commit d4d9ca0 Jun 17, 2025
148 checks passed
@auto-submit auto-submit bot deleted the fix_vscode_resources branch June 17, 2025 14:52
@flutter-dashboard flutter-dashboard bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jun 17, 2025
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 17, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
76eedfc 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 17, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
88e967f 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 17, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
a21c148 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 17, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
2d9be4c 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 17, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
c18944d 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 17, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
c43d11a 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 17, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 17, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
a9dd5fe 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
e001b06 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
9f61ca1 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
ffd63d8 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
9be52e1 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
f275fdf 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
367716d 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 18, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 18, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
ae29ad1 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 19, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 19, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
c3b4e91 
…er#169949 (flutter/flutter#170606)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jun 19, 2025
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 19, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
80c611c 
…er#169949 (flutter/flutter#170606)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jun 19, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
2d56fd3 
…er#169949 (flutter/flutter#170606)
mboetger pushed a commit to mboetger/flutter that referenced this pull request Jul 21, 2025
@bkonyi @mboetger
[ Tool ] Fix file path conflict introduced in flutter#169949 (flutter…
58cba57 
…#170606)

Was causing the following warning on Git checkout:

```
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:

  'packages/flutter_tools/test/data/vscode/application/Resources/app/package.json'
  'packages/flutter_tools/test/data/vscode/application/resources/app/package.json'
```
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
4cef06b 
…er#169949 (flutter/flutter#170606)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 14, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
070046c 
…er#169949 (flutter/flutter#170606)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
9e4b96c 
…er#169949 (flutter/flutter#170606)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 15, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
43e05c1 
…er#169949 (flutter/flutter#170606)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2025
@engine-flutter-autoroll
d4d9ca01c [ Tool ] Fix file path conflict introduced in flutter/flutt…
1d975b5 
…er#169949 (flutter/flutter#170606)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matanlurey matanlurey matanlurey approved these changes

@jtmcdole jtmcdole Awaiting requested review from jtmcdole

Assignees
No one assigned
Labels
tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bkonyi @matanlurey