Branch Syncing

Vizualinx · 2024-12-09T21:52:39.873+00:00

Up until now i have only been using branching for versioning, i never figured it out but now i have to figure it out.I am in middle of building a new feature for my app, and i had to fix some stuff on the live version, i created a new branch made the fixes and published it, i didn't touch anything that i changed in the other branch. but now when i went back to the other branch i can't sync it with the live version (see screenshot).I had the same when i tried doing this in the past, that's why i have only used branching up until now for versioning only.

Vizualinx

7 months ago

Up until now i have only been using branching for versioning, i never figured it out but now i have to figure it out.

I am in middle of building a new feature for my app, and i had to fix some stuff on the live version, i created a new branch made the fixes and published it, i didn't touch anything that i changed in the other branch. but now when i went back to the other branch i can't sync it with the live version (see screenshot).
I had the same when i tried doing this in the past, that's why i have only used branching up until now for versioning only.
Jacob Kofoed

7 months ago

Hi @Vizualinx you currently have a conflict that toddle cannot automatically resolve. You have to reset your changes on HomePage to what is on main. If you want to keep your local changes and manually resolve them, then you can duplicate the HomePage on your branch to for example Copy of HomePage and then rest HomePage.

Afterwards you can manually move changes between the two components until you have all of your desired changes and without any conflicts.
@Jacob Kofoed
Hi @Vizualinx you currently have a conflict that toddle cannot automatically resolve. You have to reset your changes on HomePage to what is on main. If you want to keep your local changes and manually resolve them, then you can duplicate the HomePage on your branch to for example Copy of HomePage and then rest HomePage.

Afterwards you can manually move changes between the two components until you have all of your desired changes and without any conflicts.
Vizualinx

7 months ago

Thanks.

The homepage is basically my whole app (it's a SPA).
I was extra careful not to touch anything I have changed in the first branch.
Max

7 months ago

I highly recommend splitting the homepage up into smaller parts. You will run into a variety of issues down the road if you have all functionality on one page. Branch syncing is one of them.
@Vizualinx
Thanks.

The homepage is basically my whole app (it's a SPA).
I was extra careful not to touch anything I have changed in the first branch.
Jacob Kofoed

7 months ago

In that case, you can still do what I said. If you duplicate it before resetting, then you can remove the homepage and rename the copy to homepage afterwards.

As @Max said, using components will make your app much easier to work with, including reducing risk of merge conflicts in the future.

Merge conflicts are really annoying in any programming language, so avoiding them is key 🔑
@Jacob Kofoed
In that case, you can still do what I said. If you duplicate it before resetting, then you can remove the homepage and rename the copy to homepage afterwards.

As @Max said, using components will make your app much easier to work with, including reducing risk of merge conflicts in the future.

Merge conflicts are really annoying in any programming language, so avoiding them is key 🔑
Vizualinx

7 months ago

Ok thanks

Branch Syncing

Vizualinx

Jacob Kofoed

Vizualinx

Max

Jacob Kofoed

Vizualinx