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

[DabDab]

@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.

[d.healey]

@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.

[DabDab]

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

[d.healey]

@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

[DabDab]

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

[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 :)

[ustk]

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

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

[DabDab]

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)

I have created a separate branch named Dabbu

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 ?

[DabDab]

What does the Pending Icon mean ?

[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

[DabDab]

@ustk Awesome.