This message was deleted.
# how-do-is
Slackbot
05/04/2023, 3:45 PMThis message was deleted.
j
Jacob Gold
05/04/2023, 3:51 PMgt repo sync --restackm
Morgante Pell
05/04/2023, 4:05 PMThis is pretty non-intuitive, I still find myself having to manually resolve a lot of conflicts.
j
Jacob Gold
05/04/2023, 4:06 PMare these conflicts with your own changes or with other changes?
Jacob Gold
05/04/2023, 4:06 PMi would expect the latter but not the former
Jacob Gold
05/04/2023, 4:06 PMif you’re seeing the former, which CLI version are you on?
e
Edo Rivai
05/04/2023, 4:21 PMi would expect the latter but not the formerAre you saying this because you assume we get the "overwrite or rebase" prompt from the cli?
Edo Rivai
05/04/2023, 4:22 PMBecause I experience this, conflicts with my own changes when restacking. In these cases, overwrite works great - no conflicts to resolve. But that only works if I know that I don't really have any unsubmitted local work (local changes, or commits that haven't been pushed yet)
Edo Rivai
05/04/2023, 4:23 PMThe rebase option is what gets me in conflict hell
j
Jacob Gold
05/04/2023, 4:24 PMI'm only talking about
repo syncdownstack getJacob Gold
05/04/2023, 4:25 PMwe do have some improvements to
downstack gete
Edo Rivai
05/04/2023, 4:26 PMAh, I didn't realize my case is caused by
downstack getrepo syncm
Morgante Pell
05/04/2023, 4:35 PMI think these ended up being a weird mix of actual conflicts and my own code. I'll take a closer look next time.
s
szaman
05/08/2023, 5:57 AMIME you can run into weird conflicts if you have any merge commits in your stack. i would suggest never mixing rebase and merge strategies within the same stack.
👍 1
j
Jacob Gold
05/08/2023, 1:37 PMYes, that's right! Thanks for flagging this @szaman — I had forgotten about that case
2 Views