This message was deleted Graphite Community #report-bugs

This message was deleted.

Slackbot

03/03/2023, 7:44 PM

This message was deleted.

merrill

03/03/2023, 7:45 PM

Cc @Jacob Gold is this the same issue you’re currently fixing?

Anshul Aggarwal

03/03/2023, 7:46 PM

I then go back to my local and do

gt repo sync

gt stack restack

gt stack submit

and it works beautifully (gt stack restack is an awesome command!)

Anshul Aggarwal

03/03/2023, 7:46 PM

And now no merge conflicts

Anshul Aggarwal

03/03/2023, 7:47 PM

I have a feeling this might be a hairy bug, can imagine there’s a lot happening in the backend to get this to work!

Jacob Gold

03/03/2023, 7:55 PM

Yep — working on this bug today 🙂

🙌 2

Jacob Gold

03/03/2023, 7:56 PM

which merge strategy did you select?

Anshul Aggarwal

03/03/2023, 8:50 PM

I think just squash and merge? whichever the default was

👍 1