SeaDAS SNAP Merge (Template) - seadas/seadas-toolbox GitHub Wiki

snap-engine:

Create the core SNAP master branch.

Create: SEADAS-master-[VERSION_DATESTR]

git checkout [SNAP-MASTER-COMMIT] -b SEADAS-master-[VERSION_DATESTR]

Create new individual branches which merge the SNAP core master with the previous version of the individual branches.

Create: SEADAS-band-group-[VERSION_DATESTR]

git checkout SEADAS-master-[VERSION_DATESTR] -b SEADAS-band-group-[VERSION_DATESTR]
git merge SEADAS-band-group-[PREVIOUS_VERSION_DATESTR]

SEADAS-band-group-[VERSION]-branded

git checkout SEADAS-band-group-[VERSION] -b SEADAS-band-group-[VERSION]-branded
git merge SEADAS-band-group-[PREVIOUS_VERSION]-branded

SEADAS-branding-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-branding-[VERSION]
git merge SEADAS-branding-[PREVIOUS_VERSION]

SEADAS-layers-colors-zoom-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-layers-colors-zoom-[VERSION]
git merge SEADAS-layers-colors-zoom-[PREVIOUS_VERSION]

SEADAS-layers-colors-zoom-[VERSION]-branded

Create: SEADAS-layers-colors-zoom-13.0.0-2025-07-30-branded

git checkout SEADAS-layers-colors-zoom-[VERSION] -b SEADAS-layers-colors-zoom-[VERSION]-branded
git merge SEADAS-layers-colors-zoom-[PREVIOUS_VERSION]-branded

SEADAS-layout-naming-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-layout-naming-[VERSION]
git merge SEADAS-layout-naming-[PREVIOUS_VERSION]

SEADAS-mask-defaults-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-mask-defaults-[VERSION]
git merge SEADAS-mask-defaults-[PREVIOUS_VERSION]

SEADAS-masking-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-masking-[VERSION]
git merge SEADAS-masking-[PREVIOUS_VERSION]

SEADAS-pixel-extraction-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-pixel-extraction-[VERSION]
git merge SEADAS-pixel-extraction-[PREVIOUS_VERSION]

SEADAS-reproject-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-reproject-[VERSION]
git merge SEADAS-reproject-[PREVIOUS_VERSION]

SEADAS-statistics-[VERSION]

git checkout SEADAS-master-[VERSION] -b SEADAS-statistics-[VERSION]
git merge SEADAS-statistics-[PREVIOUS_VERSION]

Create the merged SNAP master branch.

Create: SEADAS-master-[VERSION_DATESTR]

git checkout SEADAS-master-[VERSION_DATESTR] -b SEADAS-[SEADAS_VERSION]-SNAP-[SNAP_VERSION]-[VERSION_DATESTR]

snap-engine: Make a copied branch of latest release tag:

git checkout 9.0.4 -b SEADAS-8.4.0-SNAP-9.0.4

snap-engine: Merge All Branches

git merge SEADAS-Branding-9.0.0
git merge SEADAS-collocate-9.0.2
git merge SEADAS-ColorBarLegend-9.0.0
git merge SEADAS-color-preferences-9.0.0
git merge SEADAS-ColorManipUserSchemes-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-Reproject-9.0.0
git merge SEADAS-Statistics-9.0.0
git merge SEADAS-TimeSeries-9.0.0
git merge SEADAS-angular-view-9.0.0
git merge SEADAS-MOD_11_reader_fix-9.0.0

snap-desktop

snap-desktop: Make a copied branch of latest release tag:

git checkout 9.0.4 -b SEADAS-8.4.0-SNAP-9.0.4

snap-desktop: Merge All Branches

git merge SEADAS-Branding-9.0.2
git merge SEADAS-collocate-9.0.2
git merge SEADAS-ColorBarLegend-9.0.0
git merge SEADAS-ColorManipPalettes-9.0.0
git merge SEADAS-ColorManipPreferences-9.0.0
git merge SEADAS-ColorManipUserSchemes-9.0.0
git merge SEADAS-LayoutNaming-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-Reproject-9.0.0
git merge SEADAS-RGB-Profiles-9.0.0
git merge SEADAS-Statistics-9.0.0
git merge SEADAS-ToolbarIcons-9.0.0
git merge SEADAS-VectorImport-GreyedOut-9.0.0
git merge SEADAS-TimeSeries-9.0.0
git merge SEADAS-angular-view-9.0.0

s3tbx

s3tbx: Make a copied branch of latest release tag:

git checkout 9.0.3 -b SEADAS-8.4.0-S3TBX-9.0.3-SNAP-9.0.4

s3tbx: Merge All Branches

git merge SEADAS-Branding-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-seadas-reader-fixes-angular-9.0.0
git merge SEADAS-sentinel3-reader-fixes-9.0.0

MASTER BRANCHES

snap-engine

snap-engine: Make a copied branch of latest release tag:

git checkout master -b SEADAS-8.x-SNAP-master

snap-engine: Merge All Branches

git merge SEADAS-Branding-9.0.0
git merge SEADAS-collocate-master
git merge SEADAS-ColorBarLegend-9.0.0
git merge SEADAS-color-preferences-9.0.0
git merge SEADAS-ColorManipUserSchemes-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-Reproject-9.0.0
git merge SEADAS-Statistics-9.0.0
git merge SEADAS-TimeSeries-9.0.0
git merge SEADAS-angular-view-9.0.0
git merge SEADAS-MOD_11_reader_fix-9.0.0

snap-desktop

snap-desktop: Make a copied branch of latest release tag:

git checkout master -b SEADAS-8.x-SNAP-master

snap-desktop: Merge All Branches

git merge SEADAS-branding-master
git merge SEADAS-collocate-master
git merge SEADAS-ColorBarLegend-9.0.0
git merge SEADAS-ColorManipPalettes-9.0.0
git merge SEADAS-ColorManipPreferences-9.0.0
git merge SEADAS-ColorManipUserSchemes-9.0.0
git merge SEADAS-LayoutNaming-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-Reproject-9.0.0
git merge SEADAS-RGB-Profiles-9.0.0
git merge SEADAS-Statistics-9.0.0
git merge SEADAS-ToolbarIcons-9.0.0
git merge SEADAS-VectorImport-GreyedOut-9.0.0
git merge SEADAS-TimeSeries-9.0.0
git merge SEADAS-angular-view-9.0.0

s3tbx

s3tbx: Make a copied branch of latest release tag:

git checkout master -b SEADAS-8.x-S3TBX-master-SNAP-master

s3tbx: Merge All Branches

git merge SEADAS-Branding-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-seadas-reader-fixes-angular-9.0.0
git merge SEADAS-sentinel3-reader-fixes-9.0.0

Old

git merge SEADAS-HawkeyeL1aFix-9.0.0
git merge SEADAS-L2QualityMasks-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-PACE-L1C-L1B-V8-9.0.0

OLDER NOTES

snap-engine

snap-engine: Make Base Branch (with commit before SNAP 9.0.0 versioning:

git checkout 9.0.0 -b 9.0.0-tag
git log
git checkout c0be089e407585f71a279e803c2b49c4b7d6ea82 -b SEADAS-master-9.0.0

snap-engine: Merge All Branches

git checkout SEADAS-master-9.0.0 -b SEADAS-8.3.0-SNAP-9.0.0-SNAPSHOT
git merge SEADAS-Branding-9.0.0
git merge SEADAS-Collocate-9.0.2
git merge SEADAS-ColorBarLegend-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-Reproject-9.0.0
git merge SEADAS-Statistics-9.0.0
git merge SEADAS-TimeSeries-9.0.0

snap-engine: Merge to latest version

git checkout 9.0.1 -b 9.0.1-tag
git checkout SEADAS-8.3.0-SNAP-9.0.0-SNAPSHOT -b SEADAS-8.3.0-SNAP-9.0.1
git merge 9.0.1-tag

snap-desktop

snap-desktop: Make Base Branch (with commit before SNAP 9.0.0 versioning:

git checkout 9.0.0 -b 9.0.0-tag
git log
git checkout 0e4840d16bf3ebf4ac5f2934f500715186ad4513 -b SEADAS-master-9.0.0

snap-desktop: Merge All Branches

git checkout SEADAS-master-9.0.0 -b SEADAS-8.3.0-SNAP-9.0.0-SNAPSHOT
git merge SEADAS-Branding-9.0.0
git merge SEADAS-Collocate-9.0.2
git merge SEADAS-ColorBarLegend-9.0.0
git merge SEADAS-ColorManipPalettes-9.0.0
git merge SEADAS-ColorManipPreferences-9.0.0
git merge SEADAS-LayoutNaming-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-Reproject-9.0.0
git merge SEADAS-RGB-Profiles-9.0.0
git merge SEADAS-Statistics-9.0.0
git merge SEADAS-ToolbarIcons-9.0.0
git merge SEADAS-VectorImport-GreyedOut-9.0.0
git merge SEADAS-TimeSeries-9.0.0

snap-desktop: Merge to latest version

git checkout 9.0.1 -b 9.0.1-tag
git checkout SEADAS-8.3.0-SNAP-9.0.0-SNAPSHOT -b SEADAS-8.3.0-SNAP-9.0.1
git merge 9.0.1-tag

s3tbx

s3tbx: Make Base Branch (with commit before SNAP 9.0.0 versioning:

git checkout 9.0.0 -b 9.0.0-tag
git log
git checkout c74dd67ebd9a359e7037bbcb63c03add22ab0127 -b SEADAS-master-9.0.0

s3tbx: Merge All Branches

git checkout SEADAS-master-9.0.0 -b SEADAS-8.3.0-S3TBX-9.0.0-SNAPSHOT
git merge SEADAS-HawkeyeL1aFix-9.0.0
git merge SEADAS-L2QualityMasks-9.0.0
git merge SEADAS-NSIDC-9.0.0
git merge SEADAS-PACE-L1C-L1B-V8-9.0.0

s3tbx: Merge to latest version

git checkout 9.0.2 -b 9.0.2-tag
git checkout SEADAS-8.3.0-S3TBX-9.0.0-SNAPSHOT -b SEADAS-8.3.0-S3TBX-9.0.2
git merge 9.0.2-tag

OLDER NOTES

##SNAP Branches Overview

snap-engine:

Color Bar Layer:

SEADAS-003-SNAP-8.0.2

Color Manipulation:

SEADAS-008f-SNAP-8.0.2
SEADAS-008f-SNAP-8.0.2-seadas-defaults

SeaDAS Branding:

SEADAS-Branding-SNAP-8.0.2

Help changes:

SEADAS-help-001-SNAP-8.0.2

snap-desktop:

Color Bar Layer:

SEADAS-003-SNAP-8.0.2

Tool Bar Icon Shortcuts:

SEADAS-004-SNAP-8.0.2

Color Manipulation:

SEADAS-008f-SNAP-8.0.2

SeaDAS Branding:

SEADAS-Branding-SNAP-8.0.2

SeaDAS Default layout and numerical values/settings:

SEADAS-PackageDefaults-SNAP-8.0.2

Some Help mods:

SEADAS-help-001-SNAP-8.0.2

Sample of possible branch merging for SeaDAS 8.0.1

snap-engine:

Make branch from SNAP release tag

git pull
git checkout tags/8.0.3 -b "SNAP-8.0.3"

Update Branding branch

git checkout SNAP-8.0.3
git checkout -b "SEADAS-Branding-SNAP-8.0.3"
git merge SEADAS-Branding-SNAP-8.0.2

Update Color Manipulation branch

git checkout SNAP-8.0.3
git checkout -b "SEADAS-008f-SNAP-8.0.3-seadas-defaults"
git merge SEADAS-008f-SNAP-8.0.2-seadas-defaults 3b. Update Color Manipulation branch (SNAP Version)
git checkout SNAP-8.0.3
git checkout -b "SEADAS-008f-SNAP-8.0.3"
git merge SEADAS-008f-SNAP-8.0.2

Create SEADAS branch and merge all branches

git checkout SNAP-8.0.3
git checkout -b "SEADAS-8.0.1"
git merge SEADAS-Branding-SNAP-8.0.3
git merge SEADAS-008f-SNAP-8.0.3-seadas-defaults

snap-desktop:

Make branch from SNAP release tag

git pull
git checkout tags/8.0.3 -b "SNAP-8.0.3"

Update Branding branch

git checkout SNAP-8.0.3
git checkout -b "SEADAS-Branding-SNAP-8.0.3"
git merge SEADAS-Branding-SNAP-8.0.2

Update Package Defaults branch

git checkout SNAP-8.0.3
git checkout -b "SEADAS-PackageDefaults-SNAP-8.0.3"
git merge SEADAS-PackageDefaults-SNAP-8.0.2

Update Toolbar Icons branch

git checkout SNAP-8.0.3
git checkout -b "SEADAS-004-SNAP-8.0.3"
git merge SEADAS-004-SNAP-8.0.2

Update Color Manipulation branch

git checkout SNAP-8.0.3
git checkout -b "SEADAS-008f-SNAP-8.0.3"
git merge SEADAS-008f-SNAP-8.0.2

Create SEADAS branch and merge all branches

git checkout SNAP-8.0.3
git checkout -b "SEADAS-8.0.1"
git merge SEADAS-Branding-SNAP-8.0.2
git merge SEADAS-PackageDefaults-SNAP-8.0.2
git merge SEADAS-004-SNAP-8.0.2
git merge SEADAS-008f-SNAP-8.0.2

Git Tags

Update local repository with new tags git fetch --tags
Checkout out tag git checkout tags/9.0.0 -b 9.0.0-tag