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

Merge node #4541

Closed
wants to merge 4 commits into from
Closed

Merge node #4541

wants to merge 4 commits into from

Conversation

Stevengre
Copy link
Contributor

@Stevengre Stevengre commented Jul 22, 2024

Blocked on: #4617
Blocked on: #4621
Blocked on: #4612

This pull request addresses issue #4425 and refactors #4521 for simplification and ease of review.

  • The key implementations are in kcfg.py and semantics.py.
  • Unit tests are located in pyk/src/tests/unit/kcfg/test_merge_nodes.py.
  • Changes in other Python files are either adaptations for Edge or result from the rebase. I am uncertain how to eliminate these changes caused by rebase.

@Stevengre Stevengre self-assigned this Jul 22, 2024
@Stevengre Stevengre marked this pull request as draft July 22, 2024 08:09
@rv-jenkins rv-jenkins changed the base branch from master to develop July 22, 2024 08:10
@Stevengre Stevengre linked an issue Jul 22, 2024 that may be closed by this pull request
@Stevengre Stevengre force-pushed the merge-node branch 2 times, most recently from c00d6d7 to ea7966b Compare July 23, 2024 02:43
@Stevengre Stevengre marked this pull request as ready for review July 26, 2024 03:33
@Stevengre Stevengre requested review from palinatolmach and removed request for Baltoli and dwightguth July 26, 2024 03:34
@Baltoli
Copy link
Contributor

Baltoli commented Jul 26, 2024

@Stevengre you'll want to use git rebase -i develop to interactively select the commits that contain your changes, and to drop the ones that don't belong to this PR. This is a useful git workflow to know how to do in general - there's a good guide here if you're not familiar.

@Stevengre
Copy link
Contributor Author

Thank you so much! I'll try it!

@ehildenb
Copy link
Member

Subsumed by: #4628

@ehildenb ehildenb closed this Sep 17, 2024
@ehildenb ehildenb deleted the merge-node branch September 17, 2024 12:55
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.

Node merging to reduce branching for CSE
3 participants