Git Product home page Git Product logo

Comments (7)

oyvindseland avatar oyvindseland commented on August 11, 2024

The reason why I brought this up with Dirk is that I want to make a change in oslo_aero only. If the Externals_CAM point to a tag I need to make a branch and a pull request to CAM_develop just to update the externals file. I though that pointing to a tag in a development branch should just be done for any components that should not be changed?

from cam.

oyvindseland avatar oyvindseland commented on August 11, 2024

It looks like I need to go with the tag and create CAM_branch with Externals_CAM.
The noresm_develop branch in oslo_aero does not compile

from cam.

mvertens avatar mvertens commented on August 11, 2024

For noresm2_3 you need to use the noresm2_3_develop branch not noresm_develop

from cam.

oyvindseland avatar oyvindseland commented on August 11, 2024

Should have seen that. Compiles now

from cam.

MichaelSchulzMETNO avatar MichaelSchulzMETNO commented on August 11, 2024

To see if a tag is on a branch use eg:
git branch --contains oslo_aero_2_3a1
when being on the repository in question.
In our case the tag is in the right branch.

from cam.

oyvindseland avatar oyvindseland commented on August 11, 2024

Yes I know that I started with a tag, the question was more if that everyone should start from a tag in which all branches has to be merged individually into the development branch later or if the development should be done from the development branch in which the developer must merge the new development updates but can then make a pull request into the development branch.

from cam.

MichaelSchulzMETNO avatar MichaelSchulzMETNO commented on August 11, 2024

The confusing thing is, a tag can be on several branches or just one. Its good to check on which it is. Anyway - pull requests should be directed to the noresm2_3_develop branch. If Externals_CAM.cfg is pointing just to the Oslo-aer tag, then you will not see your changes in Oslo-aer. So there is some dependency of CAM and Oslo-aer now. If Externals_CAM.cfg points to the noresm2_3_develop branch in Oslo-aer, it will always use the head.

from cam.

Related Issues (20)

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. 📊📈🎉

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google ❤️ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.