Tonko Mulder
01/08/2024, 8:10 AM◉ tailwind/HPB-2156_split
◯ tailwind/HPB-2156 (updated remotely)
◯ develop
I’ve been resolving merge conflicts, and the CI probably updated the branch. Used gt sync, gt restack to resolve merge issues. Also used gt get to try to update the branch. That command works fine. Though the message persists. So I’m at a loss hereTonko Mulder
01/08/2024, 8:47 AMgt sync and resolving merge conflicts
~/P/project ❯❯❯ gt ls
◉ tailwind/HPB-3501-add-class-for-the-filter-icon
◯ tailwind/HPB-3497-toolbar-icon-hover-margin
◯ tailwind/HPB-2156_split
◯ tailwind/HPB-2156 (updated remotely)
◯ develop
~/P/project ❯❯❯ gt submit -u
🥞 Validating that this Graphite stack is ready to submit...
🌲 Pulling develop from remote...
develop is up to date.
There have been remote changes to tailwind/HPB-2156.
Check out the branch and run `gt get`, then try submitting again.
To overwrite remote changes, use the use the --force option of gt submit.Tonko Mulder
01/08/2024, 8:50 AMgt submit -u --force, though I wonder if this is like git push --force or git push --force-with-lease I always use the latter as to not overwrite upstream changes