Hi guys, My project is facing a conflict issue. On...
# how-do-i
l
Hi guys, My project is facing a conflict issue. On the WebApp, Graphite shows a merge conflict, but when I use
gt sync
or
gt get <name>
on the CLI, there are no conflicts. CLI shows
does not need to be restacked
. I think it should show
gt restack
to fix the conflict What should I do to resolve this?
p
(If applicable) To help us more clearly understand what you're trying to do, please provide additional details about: - Screenshots / debug logs / list of commands you've tried to run so far - Your workflow - Current state
Hey Luan, what does
gt submit
return from the CLI on that branch?
l
Hi @Brett Bedevian Unfortunately, i cannot send to you a result, since we used another solution (we have deployment schedule yesterday) We created a new stack and used
gt move
to fix it 🙂 But if I remembered exactly that
gt submit
displayed nothing (just a announce)
One more topic: how can I pull new code using Graphite? According to the documentation, we should use
gt sync
, but it doesn’t work for me. My colleague pushed new code and created a new stack above the current stack. I ran
gt sync
, but it didn’t pull anything. I had to open the Graphite WebApp and use
gt get <branch>
to fetch the top stack instead
p
Hey Luan, today
gt get [branch]
is the way but coming very soon we will have an option to fetch upstack without needing to know. keep an eye on the changelog!
🤝 1
l
Thanks for your information! I will update it with my team