When working with a co-worker on a stack, we seem ...
# how-do-i
f
When working with a co-worker on a stack, we seem to have problems reconciling our states with each other. In the first screenshot, we can see that several versions of the branch seem to be getting clobbered by each other. In the second, we have the timeline, with my coworker being the red sections. I think the biggest items we have are: • When coming back online to work on the stack, what's the best way to reset our state to the current state on the remote? Will this properly get all changes that a coworker might have added to PRs in that stack? • When making changes to a PR in the stack, do we need to worry about clobbering anyone else's work? We're modifying commits in single-commit PRs. • Should we be taking a separate approach rather than modifying commits? If we create a new branch/stacked PR off one, the tree grows branches that are harder to handle upstream it would seem.