Merging reviews
Here, an identical commit to obabae5 has been created (365d625
) and merged into main in it’s place. The local Git state has not yet been updated, and this will be reflected by plz status:
As shown above, the local state of review 57 is “behind”, meaning that rev 1 (0babae5) is not the latest revision. To synchronize the local repo state with what’s on the remote, you can run plz sync:
The local main branch state has been updated to match the remote, but plz sync has instructed us to run a git rebase command. Specifically it’s asking us to transplant one commit from the work branch onto the merged commit 365d625
. Running this command and then running plz status again shows:
Review 55 is now “merged” and it will be unaffected by further stack operations. Review 57 is no longer “behind”, it’s now “modified”, meaning that 7b5f881 will be a new revision when pushed, which we can do by running plz review:
This routine of running plz sync, git rebase, and plz review is central to the workflow of the plz CLI.
Last updated