Enrico Guiraud
11/17/2023, 9:57 AMMichael Slevin
11/17/2023, 7:57 PMReshef Elisha
11/19/2023, 9:32 AMReshef Elisha
11/20/2023, 1:28 PMSubmit PR stack
Merge bottom PR(s) with rebase method
gt sync (restacks and updates all local commits to new hashes)
*new code*
gt create; gt submit (updates ALL PRs in the stack, triggering CI for all of them)
I don't have a great solution to this, since it feels like a collision of git's "branch-based" vs graphite's "diff-based" methods colliding.Perry Randall
11/20/2023, 6:52 PMgt select
where I can pick which branch to go to interactivelyTyler Laprade
11/20/2023, 8:43 PMBen Jaffe
11/21/2023, 2:33 PMescape
no longer takes me to the home page, and it's wonderful! Not sure if this is y'all responding to the feedback, or if it was an accidental regression, but regardless, I've noticed much less friction and annoyance because I'm not teleported away from my PRs anymore 😄Spencer Ferris
11/21/2023, 7:21 PMBen Kay
11/22/2023, 11:52 AMCasper Kizewski
11/22/2023, 3:28 PMAlex xi
11/23/2023, 8:11 AMRaul
11/23/2023, 3:59 PMJonathan Coveney
11/28/2023, 12:31 PMmain < A < B < C
, am working with others, and want to merge B into A...it's not really clear what to do. when working alone, what I do is merge B into A via github, then fold B into A locally, squash, the force push. but this is not a very good process if you're working with others...I'm curious if this is on your radar? what do people do in this situation?
for me, the big utility of graphite is how easy it makes making small, incremental changes that are easy to review etc. but if I make these changes and can't merge them like this, it has turned out to be a pretty painful process. if it's not in your roadmap, I hope you will consider prioritizing it, as thus far everything else has been really greatMinh Nguyen
11/29/2023, 8:32 PMVincent de Lagabbe
11/30/2023, 10:05 AMAlex Life
11/30/2023, 1:16 PMCal Courtney
12/01/2023, 6:16 PMgt sync
gt trunk
gt ss -u
and I get The stack you are submitting will have merge conflicts with remote.
It would be really nice to get some information about which PRs will have merge conflicts 🙂bod
12/02/2023, 1:44 AMgt update
command to update the CLI version within the terminal?Ryan Atallah
12/04/2023, 9:54 AMRyan Atallah
12/04/2023, 9:56 AMReshef Elisha
12/04/2023, 11:18 AMTyler Nieman
12/04/2023, 6:00 PMgt pr --github
would be helpful for when i cannot manage the PR through graphite.Cal Courtney
12/05/2023, 3:30 PMRebase after each merge
and ignore optional CI checks
. But, I notice that when I have Merge when ready
on, I don’t get the same controls. Is there a setting where I could change the MWR behaviour?Reshef Elisha
12/05/2023, 6:48 PMgt restack; gt submit
When merging part of a stack, main<-A<-B<-C<-D
, let's say I merge A
, I'd expect to end up with main<-B<-C<-D
. NOT stale-A<-B<-C<-D
.
This is actually insidious, and possibly a bug, since if I then naively hit "merge" on B, I create a situation that I can't get out of using the UI, since now stale branch A has the commit from B. This is not the behavior on phabricator and is definitely not the user expected behavior. Github PRs auto-update their branch when merge stacked PRs, so this is also not the behavior on github.
I've seen on the slack several times the recommendation that after merging a bottom commit, we should run gt restack; gt submit
, but this just tells me that many people fall for it, and the cleanup is very annoying, involving several git operations I don't want to do day-to-day. I'd definitely consider this a bug if I didn't know it's intended by the Graphite team.Ella Rohm-Ensing
12/05/2023, 11:42 PMAlbert
12/06/2023, 9:11 AMgt log
show whether a PR has checks busy running (or a summary of checks done / outstanding)?Jeff Huang
12/06/2023, 8:56 PMCasper Kizewski
12/07/2023, 10:06 AMLeslie Lam
12/07/2023, 11:10 PMNoé RUBINSTEIN
12/08/2023, 11:02 AMgt modify --edit
the single commit of a PR, then gt submit
it, it should update the title of the pull request (and possibly the body but I understand this can be more finicky)