How do we resolve conflicts?

  • darrenbignall-1118515263315386592

    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 : (
    1118515263806115860-
  • .paul.i-1118518769447346196

    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-1118522020649508935

    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-1118522693017407528

    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-1118523239510048878

    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-1118523240835448834

    Tod

    1 year ago

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

    svenning

    1 year ago

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

    Andreas Møller

    1 year ago

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

    DarrenBignall

    1 year ago

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

    Andreas Møller

    1 year ago

    yes that would help 🙂
  • victoruxui-1118529840124006450

    Victor Giron

    1 year ago

    Happened to me in my 2 last projects
  • darrenbignall-1118530660307574875

    DarrenBignall

    1 year ago

    I have invited you @Andreas Møller 👍
  • frankenwompus-1291772560647786556

    Fisher

    6 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.
  • jacobkofoed-1291780637484650580

    Jacob Kofoed

    6 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.
  • frankenwompus-1291781455550091316

    Fisher

    6 months ago

    No, I don't.
  • frankenwompus-1291783328038387865

    Fisher

    6 months ago

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