Lost Work & branches conflict
I was in @NoCode ProCode 's office hours today and when I tried to publish my branch it failed . I see there is a conflict . If I hit reset , will it wipe out the branch ? When I try to edit the branch it is blank even though the work shows in the side panel . How do I fix this ? https://app.nordcraft.com/projects/peach_han_solo_delicious_cougar . TIA ! Hi @ branching is something that will definately improve . Right now your HomePage on your branch is so much in coflict with other changes made on a separate (now merged ) branch , that toddle cannot automatically combine the two . You will have to pick which version to use . You could , as a temporary workaround , duplicate your HomePage to a HomePage2 and then reset HomePage to resolve the conflicts . Then afterwards you can manually combine the two , or simply copy everything over from HomePage2 to HomePage if you want to just use your newer version . When working as a team , you probably don 't want to override other peoples ' changes , but rather merge them together manually or rely on toddle , which can usually merge automatically . Let me know if you are still confused about this . I know the feedback is not great on these merge conflict pages , and it is something that will improve dramatically in the future . We have plans 👍 Conflicts are super annoying in all programming languages , visual coding tools like toddle included , so the best is to avoid them entirely by splitting components into smaller decoupled pieces and otherwise avoid working on the same data across branches . I 've also had to manually handle conflicts before 😢 @Jacob Kofoed Thank you for responding . That worked ! I really appreciate the help . The only caveat is that I a solo developer so there is no one I can override . On a side note , is it possible to transfer an app created on a free account to my appsumo account ? If so , how would I do this ?
.jpeg/public)