Code

bugfix/status_nested_workspace#480

Code

Merged

bgunnar5 merged 18 commits intoLLNL:developLLNL/merlin:developfrom bgunnar5:bugfix/status_conflict_incorrectbgunnar5/merlin:bugfix/status_conflict_incorrectCopy head branch name to clipboardMay 22, 2024

+262-125

Commits

Commits on Aug 4, 2023

• resolve CHANGELOG conflict

  bgunnar5

  committed
  7888493

  Copy full SHA for 7888493

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  Show description for ec13acf
  bgunnar5

  committed
  ec13acf

  Copy full SHA for ec13acf

Commits on Nov 20, 2023

• merge latest changes from develop

  bgunnar5

  committed
  7c59fc2

  Copy full SHA for 7c59fc2

• remove a merge conflict statement that was missed

  bgunnar5

  committed
  29573d4

  Copy full SHA for 29573d4

Commits on Jan 25, 2024

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  bgunnar5

  committed
  d4a33a6

  Copy full SHA for d4a33a6

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  bgunnar5

  committed
  dc224b5

  Copy full SHA for dc224b5

Commits on Mar 11, 2024

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  bgunnar5

  committed
  54af2b6

  Copy full SHA for 54af2b6

Commits on May 16, 2024

• Merge branch 'develop' of https://github.com/bgunnar5/merlin into develop

  bgunnar5

  committed
  0849acc

  Copy full SHA for 0849acc

• have status ignore nested workspaces and modify merge rules

  bgunnar5

  committed
  00e22f0

  Copy full SHA for 00e22f0

• Merge branch 'develop' of https://github.com/bgunnar5/merlin into bugfix/status_conflict_incorrect

  bgunnar5

  committed
  5c9c6d7

  Copy full SHA for 5c9c6d7

• update CHANGELOG

  bgunnar5

  committed
  9b5fda3

  Copy full SHA for 9b5fda3

Commits on May 17, 2024

• fixed issue with escape sequences in ascii art

  bgunnar5

  committed
  c53d17e

  Copy full SHA for c53d17e

• apply Luc's suggestion

  bgunnar5

  committed
  26e7db8

  Copy full SHA for 26e7db8

• add setuptools as a requirement since python 3.12 doesn't have it natively

  bgunnar5

  committed
  0c4ee1f

  Copy full SHA for 0c4ee1f

• modify unit tests for status to use pytest rather than unittest

  bgunnar5

  committed
  06368bc

  Copy full SHA for 06368bc

• update CHANGELOG

  bgunnar5

  committed
  f56194a

  Copy full SHA for f56194a

Commits on May 21, 2024

• add fixtures for status testing and add nested workflow test

  bgunnar5

  committed
  65f08db

  Copy full SHA for 65f08db

• update CHANGELOG

  bgunnar5

  committed
  376677e

  Copy full SHA for 376677e