Syncing with remote
Very 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 3 things:- 1.Pulls in the latest changes from
origin/main(or whatever your trunk branch is) - 2.Prompts you to delete any stale local branches which have been merged in (this works even if you use squash-and-merge)
- 3.Recursively rebases your up-stack branches which have not been merged
If you want to automatically push any local branches which were rebased as a result of
gt repo sync, you can pass the -r flag, i.e. gt repo sync -r.Resolving rebase conflicts
Resolving rebase conflicts while running
gt repo sync works just like it does for gt commit create or gt commit amend.If
gt repo sync encounters any conflicts as it recursively rebases your stacked branches, you'll be prompted to resolve your conflicts before continuing. You can do this with the following workflow:1
# find which files have conflicts
2
gt status
3
​
4
# * resolve the rebase conflicts *
5
​
6
# add your changes
7
gt add -A
8
​
9
# continue the rebase operation
10
gt continue
Copied!
Now that you've resolved any conflicts, it's time to land your stack!
Last modified 2mo ago
Export as PDF
Copy link