Re-compiling with new version

[Woodcat64]

I compiled v1.1.1. using config templates plus some changes I made.

Now, when new version comes, what is the process to upgrade? Do I have to download the new version zip and overwrite everything, use new templates + my changes again? Or I keep the config files and overwrite just the src and lib directories in Marlin dir?

[clintiepoo]

This is where git can make your life easier. Here's what I did:

• Pulled the marlin branch from here
• created my own branch locally in VSCode
• made my "local" changes, commit as necessary to snapshot my local changes
• As new changes come out, I do a git pull
• Merge the changes into my local branch. If there are conflicts, I evaluate which I want keep.

[Woodcat64]

This is not a rant, but I give up.
Given that all I wanted is to build and install cloud free smart garage opener based on ESPhome and using Home Assistant and needed a custom enclosure for it, I think I went too far into this rabbit hole. :-) Now VS code won't even let me to compile, LOL.

From the pull requests I see that some amazing things are coming. So, I'm just gonna download the source when ever new version comes, add my changes.

Thanks for help

[clintiepoo]

@clintiepoo Can I suggest you something? Instead of creating a local branch, you could create a „fork“ of Jyers repository. This acts as YOUR OWN repository on which you have full control on. It is even uploaded to GitHub with your personal changes. So when your local folder gets deleted somehow you just pull your personal fork again.
Also if Jyers makes changes you just merge his changes into your own fork - that‘s how I do it.

Thank you - I may do this. I'm still learning git. I actually am self-hosting gitlab at home and just pushing there, so I can backup my own changes. I'll consider forking, but for now I'm happy like this I think.

[swbog]

Do you guys use git bash to merge your forks after changes? Or is there a way to use git desktop. Bash is a PITA

[Schnabulation]

I'm using Git Bash:

git fetch upstream
git merge upstream/Ender_3_V2_Extensible_UI
git push

...that's it!

[swbog]

Thank you. That’s what I did was kind of annoying to set up the bash. I’ve never had an install ask for that many options I just clicked next through them all. I also expected it to ask me which changes to submit. But I suppose it’ll do that if there are conflicts maybe