Skip to content

Revert incorrect fpgs-dev squash sync#6600

Merged
ooctipus merged 1 commit into
isaac-sim:fpgs-devfrom
ooctipus:ooctipus/revert-fpgs-sync-20260717
Jul 18, 2026
Merged

Revert incorrect fpgs-dev squash sync#6600
ooctipus merged 1 commit into
isaac-sim:fpgs-devfrom
ooctipus:ooctipus/revert-fpgs-sync-20260717

Conversation

@ooctipus

Copy link
Copy Markdown
Collaborator

Description

Revert #6599. That PR incorrectly squash-merged the complete develop history into one oversized commit instead of rebasing the FPGS work on top of develop.

The resulting tree is verified byte-for-byte equal to the pre-#6599 fpgs-dev tree at 3002557631e365bfbd889c504b15a3b2b27a2d07.

A separate corrected branch will be built from develop with only the intended FPGS changes replayed on top and audited before publication.

Tests

  • Restored tree hash: 333af65956c460d2572f3073cf979c1f870845b2, exactly matching the pre-Sync fpgs-dev with develop #6599 tree.
  • Pre-commit hooks passed. The LFS hook was skipped locally only because the parent checkout has an .git/info/attributes override; repository attributes are unchanged.

This reverts commit 1f90f4c. The squash merge flattened all develop changes into one oversized commit instead of rebasing the FPGS work onto develop.
@greptile-apps

greptile-apps Bot commented Jul 18, 2026

Copy link
Copy Markdown
Contributor

Too many files changed for review. (1096 files found, 100 file limit)

@ooctipus
ooctipus merged commit 9b71d0d into isaac-sim:fpgs-dev Jul 18, 2026
9 of 11 checks passed
@github-actions github-actions Bot added asset New asset feature or request isaac-sim Related to Isaac Sim team isaac-mimic Related to Isaac Mimic team infrastructure labels Jul 18, 2026
@ooctipus
ooctipus deleted the ooctipus/revert-fpgs-sync-20260717 branch July 18, 2026 06:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

asset New asset feature or request infrastructure isaac-mimic Related to Isaac Mimic team isaac-sim Related to Isaac Sim team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant