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.

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

Add customOrder and disableOptimalOrderHeuristic - fix #263 merge issues #444

Merged

Conversation

cliffsun91
Copy link
Contributor

@cliffsun91 cliffsun91 commented Jun 24, 2024

Fixes a merge issue where the changes to layout.js in #263 didn't make it in for some reason.

In the PR there are changes to two files:

  • lib/layout.js
  • lib/order/index.js

This PR was merged and the change assumed to have made it out to a recent release.

However it appears that this isn't the case when you look at the lib/layout.js on master: https://github.com/dagrejs/dagre/blob/master/lib/order/index.js

The changes to lib/order/index.js made it in however: https://github.com/dagrejs/dagre/blob/master/lib/order/index.js#L41

This PR aims to add in the changes in #263 that should have made it into master when it got merged but somehow didn't.

A good summary of the issue here: OpenFn/lightning#2160 (comment)

Fixes a merge issue where the changes to layout.js in this PR (https://github.com/dagrejs/dagre/pull/263/files) didn't make it in for some reason.
@cliffsun91 cliffsun91 changed the title Add customOrder and disableOptimalOrderHeuristic - fix #263 merge issues Add customOrder and disableOptimalOrderHeuristic - fix #263 merge issues Jun 24, 2024
@rustedgrail rustedgrail merged commit b33942c into dagrejs:master Jun 28, 2024
1 check passed
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.

2 participants