HISE Logo Forum
    • Categories
    • Register
    • Login

    How to Upgrade to Latest commits without altering my Custom modified codes

    Scheduled Pinned Locked Moved Scripting
    23 Posts 3 Posters 1.2k Views
    Loading More Posts
    • Oldest to Newest
    • Newest to Oldest
    • Most Votes
    Reply
    • Reply as topic
    Log in to reply
    This topic has been deleted. Only users with topic management privileges can see it.
    • d.healeyD
      d.healey @ustk
      last edited by d.healey

      @ustk said in How to Upgrade to Latest commits without altering my Custom modified codes:

      Then in your case, since the repos will be differentiated between Hise original and your custom version, I think the approach would be:

      Git: create a new custom branch from original develop (so for now you have two identical branches, develop and custom)
      OS: assuming you have two Hise directories on your computer, drag and overwrite your changed files from your custom Hise folder to the main Hise folder
      Git: commit the changes in your custom branch
      

      Yep, this is basically the procedure. I call my branch development (I should probably change that), and when I need updates from Christoph I pull the develop branch and merge it into my development branch. I have Christoph's branch added as a remote so I can just refer to it as develop, but I could just use upstream/develop.

      Here's the video I was referring to, you don't need to do anything on github if you don't want to, but I think it's easier to use github for creating the initial fork, and syncing between systems.

      Libre Wave - Freedom respecting instruments and effects
      My Patreon - HISE tutorials
      YouTube Channel - Public HISE tutorials

      ustkU 1 Reply Last reply Reply Quote 0
      • ustkU
        ustk @d.healey
        last edited by ustk

        @d-healey said in How to Upgrade to Latest commits without altering my Custom modified codes:

        you don't need to do anything on github if you don't want to, but I think it's easier to use github for creating the initial fork, and syncing between systems.

        This, and the most important thing =>The extra security of having duplicates somewhere in the cloudy skies!

        Can't help pressing F5 in the forum...

        d.healeyD 1 Reply Last reply Reply Quote 0
        • d.healeyD
          d.healey @ustk
          last edited by

          @ustk said in How to Upgrade to Latest commits without altering my Custom modified codes:

          This, and the most important thing =>The extra security of having duplicates somewhere in the cloudy skies!

          Definitely an advantage, but I don't like to rely on someone else's computer to be my backup. I use github + local backup + another cloud backup. For my own project I use Codeberg rather than github.

          Libre Wave - Freedom respecting instruments and effects
          My Patreon - HISE tutorials
          YouTube Channel - Public HISE tutorials

          1 Reply Last reply Reply Quote 0
          • DabDabD
            DabDab @ustk
            last edited by

            @ustk said in How to Upgrade to Latest commits without altering my Custom modified codes:

            @DabDab Watch Dave's tutos as a starting point.
            Then in your case, since the repos will be differentiated between Hise original and your custom version, I think the approach would be:

            • Git: create a new custom branch from original develop (so for now you have two identical branches, develop and custom)
            • OS: assuming you have two Hise directories on your computer, drag and overwrite your changed files from your custom Hise folder to the main Hise folder
            • Git: commit the changes in your custom branch

            So in the end, you'll have the unchanged develop as well as your custom branch, so you can navigate between the two

            I am using GitHub Desktop. Is it mandatory to use Git since I have installed GitHub Desktop already?
            @d-healey showed how to do it with Git. I have no clue how to do it using Github Desktop.
            3e6bf840-ee72-4358-9dad-4436bd69ca5f-image.png

            Bollywood Music Producer and Trance Producer.

            d.healeyD 1 Reply Last reply Reply Quote 0
            • d.healeyD
              d.healey @DabDab
              last edited by

              @DabDab Git is the version control system. Github is a website for hosting git repositories. Github Desktop is a GUI for working with git and github - when you installed Github Desktop it also installed git.

              Libre Wave - Freedom respecting instruments and effects
              My Patreon - HISE tutorials
              YouTube Channel - Public HISE tutorials

              DabDabD 1 Reply Last reply Reply Quote 0
              • DabDabD
                DabDab @d.healey
                last edited by

                @d-healey Okay. got it. I am little confused how to merge branches.

                b0a26973-98e7-4f59-a280-ba2aab19c745-image.png

                Bollywood Music Producer and Trance Producer.

                d.healeyD 1 Reply Last reply Reply Quote 0
                • d.healeyD
                  d.healey @DabDab
                  last edited by

                  @DabDab I don't know the specifics of that app but the basic thing is you pull from the branch you want to get updates from, then make sure you're on the branch you want to merge into, and you do the merge.

                  git checkout develop
                  git pull
                  git checkout myBranch
                  git merge develop
                  

                  Libre Wave - Freedom respecting instruments and effects
                  My Patreon - HISE tutorials
                  YouTube Channel - Public HISE tutorials

                  DabDabD 1 Reply Last reply Reply Quote 1
                  • DabDabD
                    DabDab @d.healey
                    last edited by

                    @d-healey Sure. But I will have to google how to do it using GitHub desktop.

                    Bollywood Music Producer and Trance Producer.

                    d.healeyD ustkU 2 Replies Last reply Reply Quote 0
                    • d.healeyD
                      d.healey @DabDab
                      last edited by d.healey

                      @DabDab said in How to Upgrade to Latest commits without altering my Custom modified codes:

                      @d-healey Sure. But I will have to google how to do it using GitHub desktop.

                      Ok, but it's faster to type those 4 lines than to Google it :)

                      Libre Wave - Freedom respecting instruments and effects
                      My Patreon - HISE tutorials
                      YouTube Channel - Public HISE tutorials

                      1 Reply Last reply Reply Quote 0
                      • ustkU
                        ustk @DabDab
                        last edited by

                        @DabDab Menu -> Branch -> Merge into current branch...

                        Dave! I got it in 3 moves! :beaming_face_with_smiling_eyes:

                        Can't help pressing F5 in the forum...

                        1 Reply Last reply Reply Quote 2
                        • DabDabD
                          DabDab
                          last edited by

                          With the help of you guys @d-healey @ustk I have been able to install and use Github Desktop and Git hub successfully. As @ustk said I have been managed to do so...

                          • Git: create a new custom branch from original develop (so for now you have two identical branches, develop and custom)
                          • OS: assuming you have two Hise directories on your computer, drag and overwrite your changed files from your custom Hise folder to the main Hise folder
                          • Git: commit the changes in your custom branch

                          So in the end, you'll have the unchanged develop as well as your custom branch, so you can navigate between the two

                          Now my Repo HISE looks something like this... (Ignore Hise-masterRDG)
                          77efe7de-d3c5-44fd-a977-a9cb2ebe0f69-image.png
                          I have created a separate branch named Dabbu
                          793dee19-a030-4c54-ab9d-4125bec189c2-image.png

                          Now my question is :

                          • How Can I get update from @Christoph-Hart repo ?
                          • Do I need to delete my existing local directory (lets say D:\HISE) and clone the original repo every time ?
                          • If I do so , will I loose my branch that I have created named Dabbu ?

                          Bollywood Music Producer and Trance Producer.

                          ustkU 1 Reply Last reply Reply Quote 0
                          • DabDabD
                            DabDab
                            last edited by

                            What does the Pending Icon mean ?
                            a856cf63-3b34-4a83-b699-678e6d94d277-image.png

                            Bollywood Music Producer and Trance Producer.

                            1 Reply Last reply Reply Quote 0
                            • ustkU
                              ustk @DabDab
                              last edited by ustk

                              @DabDab said in How to Upgrade to Latest commits without altering my Custom modified codes:

                              • How Can I get update from @Christoph-Hart repo ?

                              Select the Dabbu branch
                              go to Menu -> Branch -> Merge into current branch
                              Select develop and confirm
                              This will update Dabbu following the state of develop

                              • Do I need to delete my existing local directory (lets say D:\HISE) and clone the original repo every time ?

                              No, you don't need to do any manual intervention in the folders anymore. That's the power of Git!
                              When you select a branch, the Hise directory instantly reflects the state of the branch

                              • If I do so , will I loose my branch that I have created named Dabbu ?

                              So as above, you won't delete or change anything, otherwise there would be no point using Git

                              Can't help pressing F5 in the forum...

                              DabDabD 1 Reply Last reply Reply Quote 1
                              • DabDabD
                                DabDab @ustk
                                last edited by

                                @ustk Awesome. 😊

                                Bollywood Music Producer and Trance Producer.

                                1 Reply Last reply Reply Quote 0
                                • First post
                                  Last post

                                21

                                Online

                                1.8k

                                Users

                                12.1k

                                Topics

                                105.1k

                                Posts