From: TM5 u. m. l. <tm5...@li...> - 2021-01-22 21:34:11
|
Hi Sourish, I forked tm5 project to my repository, and made a branch jinma for COS codes. Then I request a merge to tm5 source forge repository. Maybe I don’t need to fork, if I am part of tm5 repository, and then I can clone the tm5 to my computer them make a branch and commits. The only code is in project/tracer/COS. Also some rc files in /user/jinma. Jin > On 22 Jan 2021, at 19:57, TM5 users mailing list <tm5...@li...> wrote: > > Jin, > > I do not understand what you did, or what code you merged with what. Did you push a commit to the TM5 sourceforge repository? > > Also, are you saying that the only code you changed is in proj/tracer/COS? > > -Sourish > > On 22/01/21 11:29 AM, TM5 users mailing list wrote: >> Hi Sourish, >> >> I have made new branch jinma under my repository, and requested merging to tm5. Thank you for review, and let me know if anything is wrong. >> >> Jin >> >> >>> On 21 Jan 2021, at 23:09, Ma, J. (Jin) <j....@uu...> wrote: >>> >>> Hi Sourish, >>> >>> Thank you for your reply. My GitHub repository is private since there are ongoing work. I forked the tm5 project to my source forge project like this one (https://sourceforge.net/u/jinma/tm5/ci/default/tree/). >>> The codes that needs to be upload is a folder as a tracer (COS), like CO, CO2, and other codes should be the same. I am trying to change my source forge and then request merge. Is it easy to do? I’ll let you know when I managed to update the tm5 project under my soureforge link. >>> >>> Jin >>> >>> >>>> On 21 Jan 2021, at 18:35, TM5 users mailing list <tm5...@li...> wrote: >>>> >>>> Jin, >>>> >>>> Can you check out the latest commit of the TM5 repository from sourceforge, switch to the default branch (this should happen automatically when you check out), and then compare with your code base? What I'm looking for are three lists, (a) files that are different between your code base and the TM5 repository but exist in both, (b) files that are in your code base but not in the TM5 repository, and (c) files that are in the TM5 repository but not your code base. I can look at those list and figure out how easy or difficult it would be to merge the two. >>>> >>>> What is your repository on GitHub? Can I browse it? >>>> >>>> -Sourish >>>> >>>> On 21/01/21 9:34 AM, TM5 users mailing list wrote: >>>>> Dear colleagues, >>>>> >>>>> The work of COS inverse model was done and I am willing to share it publicly on source forge. But I used GitHub rather than source forge. Could you give some tips on how to make a new branch on tm5 source forge project and avoid interfering with other projects? Many thanks. >>>>> >>>>> Best regards, >>>>> Jin Ma >>>>> >>>>> _______________________________________________ >>>>> Tm5-discuss mailing list >>>>> Tm5...@li... >>>>> https://lists.sourceforge.net/lists/listinfo/tm5-discuss >>>> >>>> _______________________________________________ >>>> Tm5-discuss mailing list >>>> Tm5...@li... >>>> https://lists.sourceforge.net/lists/listinfo/tm5-discuss >> >> _______________________________________________ >> Tm5-discuss mailing list >> Tm5...@li... >> https://lists.sourceforge.net/lists/listinfo/tm5-discuss > > > _______________________________________________ > Tm5-discuss mailing list > Tm5...@li... > https://lists.sourceforge.net/lists/listinfo/tm5-discuss |