PricingDocsAcademy
Bluesky ...
Wed, Dec 11, 10:02 PM
Log inSign up
Log inSign up
All topics

How do we resolve conflicts?

  • /attachments/1118515263315386592/1118515263806115860/Screenshot_2023-06-14_at_13.17.56.png

    DarrenBignall

    1 year ago

    I have a fair amount of work in my dev branch, but am being told there are conflicts (there shouldn't be as I have not pushed anything to main since creating this branch ...

    There is a reset on main option, but i feel like last time i did that i still lost my branch developments, and i really don't want that : (

  • Paul.I

    1 year ago

    Good question, I will let the pros answer, but got issue on my first branch merge (hopefully, I was only testing the merge system so nothing lost on my side)

  • svenning

    1 year ago

    Yes, we've seen this before 🙂 Have you been you using the same branch for some time?
  • Pushed to main multiple times?

  • DarrenBignall

    1 year ago

    Have been using this branch for about a week, without pushing, but pretty sure last time i pushed i delete the branch and create a new one (to be safe) but i might not have .... 🤔

  • svenning

    1 year ago

    Yeah, ok. We have just implemented that when you push a branch it is automatically deleted. This will prevent these issues in the future.

  • Tod

    1 year ago

    Great energy @svenning! Your continuous contribution to the toddle community just made you advanced to level 6!

  • svenning

    1 year ago

    But if you ask @Andreas Møller nicely, I think he would love to fix your branch 😃

  • DarrenBignall

    1 year ago

    https://tenor.com/view/spongebob-squarepants-begging-pretty-please-beg-on-your-knees-pray-for-mercy-gif-26344462
    😀2
  • @Andreas Møller

  • Andreas Møller

    1 year ago

    I will take a look 🙂
  • what branch is it?

  • DarrenBignall

    1 year ago

    only one there, dev. do you need me to invite you into the project?

  • Andreas Møller

    1 year ago

    yes that would help 🙂

  • Victor Giron

    1 year ago

    Happened to me in my 2 last projects

  • DarrenBignall

    1 year ago

    I have invited you @Andreas Møller 👍

  • Fisher

    2 months ago

    I hate to dig this old thread back up, but is there any way to get a branch back once it's been published? I had been editing for literally weeks and when I published all of my variables, API's and Formulas are gone.
    tagging Team toddle for visibility.
  • @Fisher
    I hate to dig this old thread back up, but is there any way to get a branch back once it's been published? I had been editing for literally weeks and when I published all of my variables, API's and Formulas are gone.
    tagging Team toddle for visibility.

    Jacob Kofoed

    2 months ago

    Do you still not see your changes when you create a new branch? Old branches needs to be synced to reflect new changes.
  • @Jacob Kofoed
    Do you still not see your changes when you create a new branch? Old branches needs to be synced to reflect new changes.

    Fisher

    2 months ago

    No, I don't.

  • Fisher

    2 months ago

    I did have a couple "reset" warnings, but they were related to components that I no longer needed.
Leave a comment

Stop scrolling. Start building.

toddle is a visual web app builder that rivals custom code — but accessible to your entire team!

Try toddle — it's free!
The two toddle Co-Founders Andreas and Kasper

Chat with @team-toddle

CEO and Co-Founder of toddle Andreas Møller

Video call our CEO

Hello, toddle!

Get in touch!

Product

PricingPackagesT&CsPrivacy Policy

Company

Press kitContact
Become partnerRefer and earn

Resources

DocumentationAcademyIntegrationsBlogFounder storiesHire experts

Community

DiscordLinkedInXYouTube

© Copyright 2024 toddle. All rights reserved.

toddle logo

Built in toddle