search

csdms / component_metadata

Metadata for CSDMS model components
0 stars 3 forks source link

Create branch for hydrology project #47

Closed mdpiper closed 9 years ago

mdpiper commented 9 years ago

This branch is a subset of the CSDMS component library containing only the components related to the "hydrology" project -- currently, the TopoFlow components.

When setting up the component metadata for this project on the WMT database server, clone this branch, not the master branch. E.g., on _river_:

$ cd /data/web/htdocs/wmt/api/topoflow/db
$ rm -rf components.git
$ git clone -b hydrology https://github.com/csdms/component_metadata components.git
mdpiper commented 9 years ago

@mperignon & @Elchin: What do you think of this?

My goal is to create a branch for each WMT project by deleting (!) all components not used in the project. This is wrong, in that if I modify any component in a branch, I can't pull it back into the master. However, as @mcflugen pointed out, we can develop on master, and rebase a project branch as needed. So master -> branch is OK, but branch -> master is very bad.

mperignon commented 9 years ago

@mdpiper, I think I understand what you are describing. Would selective merging get around the problem of merging individual changes in branches to master? I haven't tried this but it sounds like it might work: https://gist.github.com/katylava/564416

mdpiper commented 9 years ago

@mperignon Yeah, this looks like what would be needed for merging branch -> master. Thanks for finding this info.