Skip to content

Fix stealth merge conflict#904

Merged
BillyONeal merged 2 commits intomicrosoft:mainfrom
BillyONeal:fix-stealth-merge-conflict
Feb 15, 2023
Merged

Fix stealth merge conflict#904
BillyONeal merged 2 commits intomicrosoft:mainfrom
BillyONeal:fix-stealth-merge-conflict

Conversation

@BillyONeal
Copy link
Copy Markdown
Member

Between #856 and #899

@BillyONeal
Copy link
Copy Markdown
Member Author

and #889 changing alignment in ci output

@BillyONeal BillyONeal merged commit e9487f1 into microsoft:main Feb 15, 2023
@BillyONeal BillyONeal deleted the fix-stealth-merge-conflict branch February 15, 2023 01:41
@StarGate-One
Copy link
Copy Markdown
Contributor

StarGate-One commented Feb 15, 2023

@BillyONeal /cc @autoantwort
(I opened issue ticket in vcpkg 29662)
Will this fix the error building vcpkg-tool with commit:

commit 2f3a6b4 (HEAD -> main, upstream/main, origin/main, origin/HEAD)
Author: autoantwort 41973254+autoantwort@users.noreply.github.com
Date: Tue Feb 14 21:45:40 2023 +0100

ci: Don't pull in ports that causes cascades (#856)

with the following error:

3>Done Building Project "D:\vcpkg-tool\build\vcpkglib.vcxproj" (default targets) -- FAILED.
1>Done Building Project "D:\vcpkg-tool\build\vcpkg.vcxproj" (default targets) -- FAILED.

Build FAILED.

  "D:\vcpkg-tool\build\vcpkg.vcxproj" (default target) (1) ->
  "D:\vcpkg-tool\build\vcpkglib.vcxproj" (default target) (3) ->
  (ClCompile target) -> 
  D:\vcpkg-tool\src\vcpkg\commands.ci.cpp(183,18): error C2039: 'warnings': is not a member of
  'vcpkg::ActionPlan' [D:\vcpkg-tool\build\vcpkglib.vcxproj]

0 Warning(s)
1 Error(s)

Time Elapsed 00:02:09.05

I can revert the above commit locally and are able to compile/link vcpkg-tool again locally.

I can open an issue ticket if need be?

@BillyONeal
Copy link
Copy Markdown
Member Author

@BillyONeal /cc @autoantwort

(I opened issue ticket in vcpkg 29662)

Will this fix the error building vcpkg-tool with commit:

commit 2f3a6b4 (HEAD -> main, upstream/main, origin/main, origin/HEAD)

Author: autoantwort 41973254+autoantwort@users.noreply.github.com

Date: Tue Feb 14 21:45:40 2023 +0100

ci: Don't pull in ports that causes cascades (#856)

with the following error:

3>Done Building Project "D:\vcpkg-tool\build\vcpkglib.vcxproj" (default targets) -- FAILED.
1>Done Building Project "D:\vcpkg-tool\build\vcpkg.vcxproj" (default targets) -- FAILED.

Build FAILED.

  "D:\vcpkg-tool\build\vcpkg.vcxproj" (default target) (1) ->
  "D:\vcpkg-tool\build\vcpkglib.vcxproj" (default target) (3) ->
  (ClCompile target) -> 
  D:\vcpkg-tool\src\vcpkg\commands.ci.cpp(183,18): error C2039: 'warnings': is not a member of
  'vcpkg::ActionPlan' [D:\vcpkg-tool\build\vcpkglib.vcxproj]

0 Warning(s)

1 Error(s)

Time Elapsed 00:02:09.05

I can revert the above commit locally and are able to compile/link vcpkg-tool again locally.

I can open an issue ticket if need be?

It should be fixed now

@StarGate-One
Copy link
Copy Markdown
Contributor

Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants