Fix merge conflict between `develop` and `infrahub-develop`#566

Merged

ogenstad merged 24 commits intoinfrahub-developfrom

pog-infrahub-develop-merge-conflict-20251007

Oct 7, 2025

Commits on Sep 8, 2025

Add `create_diff` to the clients to manually create a diff between two times. (#531)
minitriga
authored

Commits on Sep 9, 2025

Fix issue with `render` ctl command not using branch environment variables (#536)
minitriga
authored

Commits on Sep 10, 2025

Remove unnecessary assignments before `return` statement
ogenstad
committed

Commits on Sep 11, 2025

Merge pull request #542 from opsmill/pog-returns
ogenstad
authored

Commits on Sep 13, 2025

Commits on Sep 15, 2025

Commits on Sep 16, 2025

Commits on Sep 19, 2025

Add convert_object_type method (#554)
LucasG0
authored

Commits on Sep 22, 2025

Commits on Sep 24, 2025

Add to object conversion input (#558)
LucasG0
authored

Commits on Oct 7, 2025

Merge branch 'develop' into 'infrahub-develop' with resolved conflicts
ogenstad
committed