File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -49,13 +49,13 @@ resolve conflicts in *each* PR, not just for the entire stack.)
4949** How do I start a new feature?** Just checkout master on a new
5050branch, and start working on a fresh branch.
5151
52- ** WARNING. ** You will NOT be able to merge these commits using the
53- normal GitHub UI, as their branch bases won't be master. Use
54- ` ghstack land $PR_URL ` (or alternatively ` ghstack land #PR_NUM ` ) to land
52+ ** How do I merge my changes? ** Warning: You will NOT be able to merge these
53+ commits using the normal GitHub UI, as their branch bases won't be master.
54+ Use ` ghstack land $PR_URL ` (or alternatively ` ghstack land #PR_NUM ` ) to land
5555a ghstack'ed pull request.
5656
5757You can also setup a GitHub action to allow a bot land.
58- [ ghstack_land_example] ( https://github.com/Chillee/ghstack_land_example/blob/main/.github/workflows/issue_comment .yml )
58+ [ ghstack_land_example] ( https://github.com/Chillee/ghstack_land_example/blob/main/.github/workflows/ghstack_land .yml )
5959is an end-to-end example of how to do this.
6060
6161## Structure of submitted pull requests
You can’t perform that action at this time.
0 commit comments