This message was deleted.

We're going to work on some improvements to collaboration in the CLI! cc @Jacob Gold for viz

what are the issues you're running into? are the conflicts you're seeing not expected?

Hi @Jacob Gold thanks for your help. Sorry for delay getting back. I was initially doing some backend work and using Graphite, and coworker wasn't using graphite, and had some frontend work in a branch that contained my work. Our workflow involved periodically merging my updates from my stack's top branch into coworker's working branch. Now we'd like to try using Graphite to collaborate on a stack, so coworker did

gt dsg my-top-branch

and then

gt branch track

on her branch, then

gt upstack onto my-top-branch

and was able to do

gt stack submit

successfully. (That was the topic of my previous thread https://graphite-community.slack.com/archives/C02DRNRA9RA/p1678923784979459) Now I'm not sure why, maybe due to the fact that we weren't initially using Graphite to collaborate, but every time I make a change in one of my lower branches, and then do

gt stack restack

I get a conflict when trying to rebase my coworker's branch (which is the new top branch). I tried to resolve the conflicts but maybe due how rebase works, more conflicts keep coming up over and over.. so instead of resolving the conflicts, I found that after doing

git merge -X theirs my-top-branch

into my coworker's branch, I'm able to do

gt stack restack

without conflicts. But every time I make a commit to a lower branch and do stack restack this conflict happens again.. Wondering if there is some way to stop this from happening? I think we are trying to build a new branch using Graphite rather than using the old branch... but wondering if that seems like a good idea, and also hoping to understand what might be happening and if there would be a simple way to stop the conflicts from happening over and over. Would

git rerere

be a good idea here? Or is there a way to merge or squash the commits somehow to prevent the rebase conflicts from recurring?