Hey, I encountered an error while merging code. So...
# report-bugs
o
Hey, I encountered an error while merging code. So we had a stack with 3 branches
(branch A <= branch B <= branch C)
. I was working on branches
A, B
. Another developer was working on branch
C
. So he pushed some code and created a PR for it. After that, branches A and B were merged into the dev branch, and then I went to his branch via
gt co <branch name>
and pulled the remote version. After that, I made some changes and updated the PR using the command line
gt modify -m "commit message".
And when this branch
C
was merged (squash) into the dev branch, I realized that my changes were not there. Could you please explain me how that was possible, and maybe we are using Graphite not in that way?
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>
Good Morning Oleksandr, 1) what version of the CLI are you on. if 1.7.0 or later, checking out your colleagues branch will leave it in a frozen state, did you unfreeze it? is it possible you missed this message and didnt actually successfully modify? 2) if you ran
gt modify
you would still need to run
gt submit
to push your changes to remote. Is it possible you ran
gt modify
 but not
gt submit
?
o
My CLI version is 1.6.1. Sorry, forgot to mention in the message above that after
gt modify
i submitted it with
gt ss
p
hmmm, that definitely should work as expected. That said, you are on a very old version of the CLI. I would update to the latest and then keep an eye if this happens again. If it does then please ping back here.
o
Ok, thanks!