SeaDAS‐SNAP 13 Merge - seadas/seadas-toolbox GitHub Wiki

This page illustrates the commands to execute when merging SeaDAS forward from the SNAP 12.x trunk fork to the SNAP 13.x trunk fork. This page does not include details regarding resolving the merge conflicts.

The statement "Resolve any conflicts" should not be taken lightly and should NOT only include addressing blatant merge failures but also an awareness of auto-merging. Just because something is successfully auto-merged by git, doesn't mean that the logic has no conflicts. In cases of auto-merging, the SNAP code should be looked at to assess what were the actual changes made between the SNAP revisions.

Create Master Branch (snap-engine)

Create a SNAP master branch defined at the trunk commit just prior to where 13.x forked off.

Create Branch (snap-engine) : SEADAS-master-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout master
  3. git pull
  4. git log

View log in order to find commit at 13.x fork. Create branch at the 13.x fork commit.

  1. git checkout 6ac91dd9cbccdd65eb92824e97249d5e1cf1af08 -b SEADAS-master-13.0.0-2025-07-30

Create Individual Branches (snap-engine)

Merge SNAP master with the previous version of each individual branch to create a new version of each individual branch

Create Branch (snap-engine) : SEADAS-band-group-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-band-group-13.0.0-2025-07-30
  3. git merge SEADAS-band-group-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-band-group-13.0.0-2025-07-30-branded (*)

Note*: does not directly use the master and must be done after creating SEADAS-band-group-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-band-group-13.0.0-2025-07-30 -b SEADAS-band-group-13.0.0-2025-07-30-branded
  3. git merge SEADAS-band-group-12.0.0-2025-02-27-branded

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-band-group-angular-spectrum-13.0.0-2025-07-30 (*)

This step needs to be done after making snap-engine:SEADAS-band-group-13.0.0-2025-07-30

This is a special branch (only to be used if using snap-desktop:SEADAS-angular-13.0.0-2025-07-30 or snap-desktop:SEADAS-spectrum-13.0.0-2025-07-30)

snap-desktop:SEADAS-angular-13.0.0-2025-07-30 and snap-desktop:SEADAS-spectrum-13.0.0-2025-07-30 require SEADAS-band-group-13.0.0-2025-07-30, however, snap-engine:SEADAS-band-group-angular-spectrum-13.0.0-2025-07-30 is a trimmed down version of snap-engine:SEADAS-band-group-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-band-group-angular-spectrum-13.0.0-2025-07-30
  3. git checkout SEADAS-band-group-13.0.0-2025-07-30 snap-core/src/main/java/org/esa/snap/core/util/StringUtils.java

Create Branch (snap-engine) : SEADAS-branding-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-branding-13.0.0-2025-07-30
  3. git merge SEADAS-branding-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-map-gridlines-13.0.0-2025-07-30 (* FUTURE)

Note* : this is a new branch so the previous SEADAS-map-gridlines-12.0.0-2025-02-27 does not actually exist, but its presence here serves as a template for future revisions.

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-map-gridlines-13.0.0-2025-07-30
  3. git merge SEADAS-map-gridlines-12.0.0-2025-02-27 (* does not actually exist)

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-layers-colors-zoom-13.0.0-2025-07-30 (*)

Note*: additionally contains SEADAS-map-gridlines-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-layers-colors-zoom-13.0.0-2025-07-30
  3. git merge SEADAS-layers-colors-zoom-12.0.0-2025-02-27

Resolve any conflicts.

  1. git merge SEADAS-map-gridlines-13.0.0-2025-07-30

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded (*)

Note*: does not directly use the master and must be done after creating SEADAS-layers-colors-zoom-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-layers-colors-zoom-13.0.0-2025-07-30 -b SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded
  3. git merge SEADAS-layers-colors-zoom-12.0.0-2025-02-27-branded

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-layout-naming-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-layout-naming-13.0.0-2025-07-30
  3. git merge SEADAS-layout-naming-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-mask-defaults-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-mask-defaults-13.0.0-2025-07-30
  3. git merge SEADAS-mask-defaults-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-masking-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-masking-13.0.0-2025-07-30
  3. git merge SEADAS-masking-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-pixel-extraction-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-pixel-extraction-13.0.0-2025-07-30
  3. git merge SEADAS-pixel-extraction-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-reproject-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-reproject-13.0.0-2025-07-30
  3. git merge SEADAS-reproject-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-engine) : SEADAS-statistics-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-statistics-13.0.0-2025-07-30
  3. git merge SEADAS-statistics-12.0.0-2025-02-27

Resolve any conflicts.

Create Merged Branch at 13.x Fork (snap-engine)

Merge all the individual branches in a new merged branch at the trunk of 13.x fork.

Create Branch (snap-engine) : SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

Merge Branch (snap-engine) : SEADAS-band-group-13.0.0-2025-07-30-branded (*)

Note* : SEADAS-band-group-13.0.0-2025-07-30 is already contained within SEADAS-band-group-13.0.0-2025-07-30-branded and does not need to be merged here.

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-band-group-13.0.0-2025-07-30-branded

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-branding-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-branding-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded (*)

Note* : SEADAS-layers-colors-zoom-13.0.0-2025-07-30 and SEADAS-map-gridlines-13.0.0-2025-07-30 are already contained within SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded and do not need to be merged here.

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-layout-naming-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-layout-naming-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-mask-defaults-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-mask-defaults-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-masking-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-masking-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-pixel-extraction-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-pixel-extraction-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-reproject-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-reproject-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-engine) : SEADAS-statistics-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-statistics-13.0.0-2025-07-30

Resolve any conflicts.

Create Merged Branch at 13.0.0 Tag (snap-engine)

Merge the the 13,x fork branch out to a new merged branch at the SNAP 13.0.0 tag.

Create Branch (snap-engine) : SEADAS-11.0.0-SNAP-13.0.0

Checkout the latest tag as a local branch.

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout 13.0.0
  3. git pull
  4. git checkout 13.0.0 -b SNAP-13.0.0-tag

Merge trunk out to tag.

  1. git checkout SNAP-13.0.0-tag -b SEADAS-11.0.0-SNAP-13.0.0
  2. git merge SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

Resolve any conflicts.

Examples of Revisions: Merging Individual Branches into the Merged Branches (snap-engine)

Example: Revision has been made to SEADAS-band-group-13.0.0-2025-07-30

First: merge this into its branded branch (if applicable)

  1. cd ${SEADAS-DEV}/snap-engine
  2. git checkout SEADAS-band-group-13.0.0-2025-07-30-branded
  3. git merge SEADAS-band-group-13.0.0-2025-07-30

Second: merge out into the merged trunk

  1. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  2. git merge SEADAS-band-group-13.0.0-2025-07-30

Third: merge out into the merged tag

  1. git checkout SEADAS-11.0.0-SNAP-13.0.0
  2. git merge SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

Create Master Branch (snap-desktop)

Create a SNAP master branch defined at the trunk commit just prior to where 13.x forked off.

Create Branch (snap-desktop) : SEADAS-master-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout master
  3. git pull
  4. git log

View log in order to find commit at 13.x fork. Create branch at the 13.x fork commit.

  1. git checkout 28499ddd241970b403ac8c5f18baf13cf96b2f41 -b SEADAS-master-13.0.0-2025-07-30

Create Individual Branches (snap-desktop)

Merge SNAP master with the previous version of each individual branch to create a new version of each individual branch

Create Branch (snap-desktop) : SEADAS-angular-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-angular-13.0.0-2025-07-30
  3. git merge SEADAS-angular-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-band-group-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-band-group-13.0.0-2025-07-30
  3. git merge SEADAS-band-group-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-branding-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-branding-13.0.0-2025-07-30
  3. git merge SEADAS-branding-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-color-palettes-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-color-palettes-13.0.0-2025-07-30
  3. git merge SEADAS-color-palettes-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-decimal-wavelengths-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-decimal-wavelengths-13.0.0-2025-07-30
  3. git merge SEADAS-decimal-wavelengths-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-layers-colors-zoom-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-layers-colors-zoom-13.0.0-2025-07-30
  3. git merge SEADAS-layers-colors-zoom-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded (*)

Note*: does not directly use the master and must be done after creating SEADAS-layers-colors-zoom-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-layers-colors-zoom-13.0.0-2025-07-30 -b SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded
  3. git merge SEADAS-layers-colors-zoom-12.0.0-2025-02-27-branded

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-layout-naming-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-layout-naming-13.0.0-2025-07-30
  3. git merge SEADAS-layout-naming-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-reproject-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-reproject-13.0.0-2025-07-30
  3. git merge SEADAS-reproject-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-spectrum-view-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-spectrum-view-13.0.0-2025-07-30
  3. git merge SEADAS-spectrum-view-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-spectrum-view-13.0.0-2025-07-30-branded (*)

Note*: does not directly use the master and must be done after creating SEADAS-spectrum-view-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-spectrum-view-13.0.0-2025-07-30 -b SEADAS-spectrum-view-13.0.0-2025-07-30-branded
  3. git merge SEADAS-spectrum-view-12.0.0-2025-02-27-branded

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-statistics-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-statistics-13.0.0-2025-07-30
  3. git merge SEADAS-statistics-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (snap-desktop) : SEADAS-toolbar-icons-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-toolbar-icons-13.0.0-2025-07-30
  3. git merge SEADAS-toolbar-icons-12.0.0-2025-02-27

Resolve any conflicts.

Create Merged Branch at 13.x Fork (snap-desktop)

Merge all the individual branches in a new merged branch at the trunk of 13.x fork.

Create Branch (snap-desktop) : SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

Merge Branch (snap-desktop) : SEADAS-angular-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-angular-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-band-group-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-band-group-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-branding-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-branding-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-color-palettes-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-color-palettes-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-decimal-wavelengths-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-decimal-wavelengths-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-layout-naming-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-layout-naming-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-reproject-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-reproject-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-spectrum-view-13.0.0-2025-07-30-branded

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-spectrum-view-13.0.0-2025-07-30-branded

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-statistics-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-statistics-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (snap-desktop) : SEADAS-toolbar-icons-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-toolbar-icons-13.0.0-2025-07-30

Resolve any conflicts.

Create Merged Branch at 13.0.0 Tag (snap-desktop)

Merge the the 13.x fork branch out to a new merged branch at the SNAP 13.0.0 tag.

Create Branch (snap-desktop) : SEADAS-11.0.0-SNAP-13.0.0

Checkout the latest tag as a local branch.

  1. cd ${SEADAS-DEV}/snap-desktop
  2. git checkout 13.0.0
  3. git pull
  4. git checkout 13.0.0 -b SNAP-13.0.0-tag

Merge trunk out to tag.

  1. git checkout SNAP-13.0.0-tag -b SEADAS-11.0.0-SNAP-13.0.0
  2. git merge SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

Resolve any conflicts.

Create Master Branch (optical-toolbox)

Create a SNAP master branch defined at the trunk commit just prior to where 13.x forked off.

Create Branch (optical-toolbox) : SEADAS-master-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout master
  3. git pull
  4. git log

View log in order to find commit at 13.x fork. Create branch at the 13.x fork commit.

  1. git checkout 5268df7b9fe78995812f62d900d21e0b05b98627 -b SEADAS-master-13.0.0-2025-07-30

Create Individual Branches (optical-toolbox)

Merge SNAP master with the previous version of each individual branch to create a new version of each individual branch

Create Branch (optical-toolbox) : SEADAS-branding-help-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-branding-help-13.0.0-2025-07-30
  3. git merge SEADAS-branding-help-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (optical-toolbox) : SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30
  3. git merge SEADAS-seadas-reader-fixes-angular-NSIDC-12.0.0-2025-02-27

Resolve any conflicts.

Create Branch (optical-toolbox) : SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30-branded (*)

Note*: does not directly use the master and must be done after creating SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30 -b SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30-branded
  3. git merge SEADAS-seadas-reader-fixes-angular-NSIDC-12.0.0-2025-02-27-branded

Resolve any conflicts.

Create Branch (optical-toolbox) : SEADAS-sentinel3-reader-fixes-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-sentinel3-reader-fixes-13.0.0-2025-07-30
  3. git merge SEADAS-sentinel3-reader-fixes-12.0.0-2025-02-27

Resolve any conflicts.

Create Merged Branch at 13.x Fork (optical-toolbox)

Merge all the individual branches in a new merged branch at the trunk of 13.x fork.

Create Branch (optical-toolbox) : SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-master-13.0.0-2025-07-30 -b SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

Merge Branch (optical-toolbox) : SEADAS-branding-help-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-branding-help-13.0.0-2025-07-30

Resolve any conflicts.

Merge Branch (optical-toolbox) : SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30-branded

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-seadas-reader-fixes-angular-NSIDC-13.0.0-2025-07-30-branded

Resolve any conflicts.

Merge Branch (optical-toolbox) : SEADAS-sentinel3-reader-fixes-13.0.0-2025-07-30

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout SEADAS-11.0.0-SNAP-13.0.0-2025-07-30
  3. git merge SEADAS-sentinel3-reader-fixes-13.0.0-2025-07-30

Resolve any conflicts.

Create Merged Branch at 13.0.0 Tag (optical-toolbox)

Merge the the 13.x fork branch out to a new merged branch at the SNAP 13.0.0 tag.

Create Branch (optical-toolbox) : SEADAS-11.0.0-SNAP-13.0.0

Checkout the latest tag as a local branch.

  1. cd ${SEADAS-DEV}/optical-toolbox
  2. git checkout 13.0.0
  3. git pull
  4. git checkout 13.0.0 -b SNAP-13.0.0-tag

Merge trunk out to tag.

  1. git checkout SNAP-13.0.0-tag -b SEADAS-11.0.0-SNAP-13.0.0
  2. git merge SEADAS-11.0.0-SNAP-13.0.0-2025-07-30

Resolve any conflicts.