Skip to content

Resolve pr merge conflicts develop with main #2675

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 431 commits into from
Nov 9, 2024
Merged

Resolve pr merge conflicts develop with main #2675

merged 431 commits into from
Nov 9, 2024

Conversation

@cvvergara
Copy link
Member

@cvvergara cvvergara commented Oct 24, 2024 •
edited
Loading

The PR #2674 has conflicts

  • Fix conflicts
  • Fix Some additional changes that the were not marked as conflicts

@pgRouting/admins

github-actions bot and others added 30 commits May 7, 2024 21:32
@github-actions
Update locale: commit 6afe2ca
792c9fb
@cvvergara
(lineGraph)(pgtap) tests from wiki and mathworld
996e7ca
@cvvergara
(lineGraph)(pgtap) design test rewritten on pgtap
5acff54
@cvvergara
(CI) refining tidy-vs-commit to not process .conf files
3e1f3af
@cvvergara
(lineGraph) wrong code -> good code
dc1996f
@cvvergara
(lineGraph) Using fixed code
7e3338f
@cvvergara
(lineGraph)(docq) Updating to new results
a0c6e64
@cvvergara
(docqueries/pgr_lineGraph) adding additional examples
771c3c0
@cvvergara
(doc/pgr_lineGraph) adding additional examples
c859e24
@cvvergara
(pgtap/pgr_lineGraph) adjusting mathworld unit test
096739c
@cvvergara
Adding self loops on directed graphs
a1c5f41
@cvvergara
updating NEWS and release notes
db2b66e
@cvvergara
Fixing conflicts
8582944
@github-actions
Update locale: commit 8582944
78df738
@weblate @cvvergara
Update translation files
373f9d9 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Update translation files

Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/
Translation: pgRouting/pgRouting
@cvvergara
Translated using Weblate (Chinese (Simplified))
997deea 
Currently translated at 99.9% (5168 of 5173 strings)

Co-authored-by: Celia Virginia Vergara Castillo <vicky@erosion.dev>
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Translation: pgRouting/pgRouting
@cvvergara
Translated using Weblate (Chinese (Simplified))
907f8bf 
Currently translated at 99.9% (5168 of 5173 strings)

Co-authored-by: Zuochenwei <zuochenwei5@gmail.com>
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Translation: pgRouting/pgRouting
@cvvergara
Translated using Weblate (Chinese (Simplified))
0ab4b5f 
Currently translated at 99.9% (5168 of 5173 strings)

Co-authored-by: DeepL <noreply-mt-deepl@weblate.org>
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Translation: pgRouting/pgRouting
@cvvergara
Translated using Weblate (Chinese (Simplified))
02231df 
Currently translated at 99.9% (5172 of 5173 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@cvvergara
Translated using Weblate (Chinese (Simplified))
e8fa897 
Currently translated at 99.9% (5172 of 5173 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@cvvergara
Translated using Weblate (Chinese (Simplified))
781b4f4 
Currently translated at 100.0% (5173 of 5173 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@cvvergara
Translated using Weblate (Chinese (Simplified))
c27eaad 
Currently translated at 100.0% (5173 of 5173 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@weblate @cvvergara
Update translation files
cff3a51 
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/
@cvvergara
Translated using Weblate (Spanish)
da40458 
Currently translated at 89.4% (4650 of 5199 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
@cvvergara
Translated using Weblate (Spanish)
b176054 
Currently translated at 89.4% (4650 of 5199 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
@cvvergara
Translated using Weblate (Spanish)
9e3216d 
Currently translated at 90.3% (4697 of 5199 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
@cvvergara
Translated using Weblate (Chinese (Simplified))
8b2cf2e 
Currently translated at 99.5% (5175 of 5199 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@cvvergara
Translated using Weblate (Chinese (Simplified))
7c56b54 
Currently translated at 99.5% (5178 of 5199 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@cvvergara
Translated using Weblate (Chinese (Simplified))
ac8a05d 
Currently translated at 99.5% (5178 of 5199 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@cvvergara
Translated using Weblate (Chinese (Simplified))
88d61b0 
Currently translated at 99.9% (5197 of 5199 strings)

Translation: pgRouting/pgRouting
Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
@cvvergara cvvergara added this to the Release 3.7.0 milestone Oct 24, 2024
@cvvergara cvvergara requested a review from robe2 October 24, 2024 19:28
@cvvergara cvvergara marked this pull request as draft October 24, 2024 19:29
@cvvergara cvvergara marked this pull request as ready for review October 24, 2024 19:32
@cvvergara cvvergara marked this pull request as draft October 24, 2024 19:40
@cvvergara cvvergara changed the base branch from develop to main October 24, 2024 19:43
@cvvergara cvvergara marked this pull request as ready for review October 24, 2024 19:43
@cvvergara cvvergara requested review from iosefa, krashish8, omshinde, rahulworld and sanak and removed request for rahulworld October 24, 2024 19:55
@cvvergara cvvergara merged commit 6c8dcbb into pgRouting:main Nov 9, 2024
11 checks passed
@cvvergara cvvergara deleted the resolve-pr-merge-conflicts-develop-with-main branch November 9, 2024 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sanak sanak sanak approved these changes

@robe2 robe2 robe2 approved these changes

@iosefa iosefa iosefa approved these changes

@krashish8 krashish8 krashish8 approved these changes

@omshinde omshinde Awaiting requested review from omshinde

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Release 3.7.0

Development

Successfully merging this pull request may close these issues.

8 participants

@cvvergara @sanak @robe2 @iosefa @krashish8 @weblate @bedupako12mas @vslashg