Hi folks! I’m running into an issue with checking...
# report-bugs
r
Hi folks! I’m running into an issue with checking out my colleague’s Graphite Stack. Just doing
gt get <newest_branch_in_their_stack>
results in Graphite telling me all of those branches have diverged and requiring me to update my colleague’s code if I do
gt submit
. I don’t understand where this divergence has come from because I just do
gt sync
followed by the above
gt get
. Screenshots and details in the thread.
p
(If applicable) To help us repro, please send the following if you haven't already: - PR links, screenshots, and/or debug output if applicable - Repro steps - Does this happen consistently? Just to you or others on your team also? - Is this a regression? Is the problem new? - If you're having an issue with the CLI, please send us debug logs using
gt feedback --with-debug-context <any message>
r
On a clean
dev
After syncing (this my only branch)
Doing
gt get
Results in diverged state
Graphite version is
1.6.4
p
hey Radosław, did your colleague submit their branch using
gt
?
r
Yes, they are using Graphite and it is a proper graphite stack (cc @Cyprien Descheemaeker)
Also sent debug feedback via CLI :
👍 1
We also tried
gt get
&
gt sync
after/before the checkout, and also making sure the local branches were fully deleted before doing
gt get
p
Our engineers had a look into this and found that when you ran
gt get
the remote version of the stack was pulled in locally restacked onto the latest
dev
branch. (In the image you provided, you can see that happen after
Restacking branches…
This means the local branches will indeed be based on a later version of
dev
than the remote branches, which means there are updates locally that need to be submitted. This also explains why you receive the message about branches having diverged. If you don't want this behavior, you can use the
--no-restack
option with
gt get
to avoid it.
r
Oh, that makes sense, I did miss that. Thank you for the investigation! So I assume that if my colleague restacks their stack on the newest
dev
and submits that, if I then do
gt sync
all should be good, because bot their and my stacks would be based on the same
dev
version?
👍 1