Skip to content
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

Skara mirrors failing with merge conflict tracking #21

Closed
andrew-m-leonard opened this issue Jun 22, 2022 · 1 comment
Closed

Skara mirrors failing with merge conflict tracking #21

andrew-m-leonard opened this issue Jun 22, 2022 · 1 comment

Comments

@andrew-m-leonard
Copy link
Contributor

andrew-m-leonard commented Jun 22, 2022 •
edited
Loading

Failed: 22/06/2022

+++ b/common/autoconf/generated-configure.sh
@@@ -4982,7 -4980,7 +4982,11 @@@ VS_TOOLSET_SUPPORTED_2019=fals
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
++<<<<<<< HEAD
 +DATE_WHEN_GENERATED=1655893790
++=======
+ DATE_WHEN_GENERATED=1652906026
++>>>>>>> jdk8u342-b02-aarch32-20220518
@andrew-m-leonard andrew-m-leonard changed the title jdk8u Skara mirrors failing with merge conflict in the autoconf TIMESTAMP field regularly Skara mirrors failing with merge conflict tracking Jun 22, 2022
@andrew-m-leonard
Copy link
Contributor Author

With jdk8u whenever there is an autoconf file change upstream, this will create a merge-conflict with Adoptium patches to m4 files which will conflict on the generated-configure.sh

not sure there is any avoiding that

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@andrew-m-leonard