Syncing with a remote repository
Often, as you're building, the remote trunk branch will move ahead of your local repository, and you'll want to pull in the latest changes and resolve any conflicts before you land your pull requests.
Syncing your repo
If your remote trunk branch (i.e.
origin/main) gets ahead of your local repository while you're developing, you can use
gt repo sync to bring your stack up-to-date.
gt repo sync does a few things:
Pulls in the latest changes from
origin/main(or whatever your trunk branch is)
Prompts you to delete any stale local branches which have been merged in (this works even if you use squash-and-merge)
Optionally restacks your up-stack branches which have not been merged and your current stack onto
main. If you encounter any merge conflicts, you'll be prompted to resolve them as part of the restack — see the section on restacking for more details!
Let's say that we've squash-and-merged in one branch of our three-branch stack from earlier. We can sync that change in from remote:
🌲 Pulling main from remote...main fast-forwarded to 4604ea03f728126332fa23bbfa74643c18d2fca3.🧹 Checking if any branches have been merged/closed and can be deleted...✔ pp--06-14-part_2 is merged into main. Delete it? … yesDeleted branch pp--06-14-part_2
Now, if we run
gt log, we see that
part_2 is now based on
◉ pp--06-14-part_3 (current)│ 39 minutes ago││ PR #101 part 2│ pp--06-14-part_2: https://app.graphite.dev/github/pr/withgraphite/pranathi-test-repo/102││ 95338df - part 3│◯ pp--06-14-part_2 (needs restack)│ 39 minutes ago││ PR #101 part 2│ pp--06-14-part_2: https://app.graphite.dev/github/pr/withgraphite/pranathi-test-repo/101││ 95610c6 - part 2│◯ main (current)│ 30 minutes ago│
Since we didn't restack as part of the
sync command here (we could have done so with
--restack), we see that
part_2 needs a restack onto
main. We'll talk about what that means in the next section: Restacking branches.