Enrico Guiraud11/17/2023, 9:57 AM
Michael Slevin11/17/2023, 7:57 PM
Reshef Elisha11/19/2023, 9:32 AM
Reshef Elisha11/20/2023, 1:28 PM
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.
Submit 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)
Perry Randall11/20/2023, 6:52 PM
where I can pick which branch to go to interactively
Tyler Laprade11/20/2023, 8:43 PM
Ben Jaffe11/21/2023, 2:33 PM
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 Ferris11/21/2023, 7:21 PM
Ben Kay11/22/2023, 11:52 AM
Casper Kizewski11/22/2023, 3:28 PM
Alex xi11/23/2023, 8:11 AM
Raul11/23/2023, 3:59 PM
Jonathan Coveney11/28/2023, 12:31 PM
, 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 great
main < A < B < C
Minh Nguyen11/29/2023, 8:32 PM
Alex Life11/30/2023, 1:16 PM
Cal Courtney12/01/2023, 6:16 PM
and I get
gt ss -u
It would be really nice to get some information about which PRs will have merge conflicts 🙂
The stack you are submitting will have merge conflicts with remote.
bod12/02/2023, 1:44 AM
command to update the CLI version within the terminal?
Ryan Atallah12/04/2023, 9:54 AM
Ryan Atallah12/04/2023, 9:56 AM
Reshef Elisha12/04/2023, 11:18 AM
Tyler Nieman12/04/2023, 6:00 PM
would be helpful for when i cannot manage the PR through graphite.
gt pr --github
Cal Courtney12/05/2023, 3:30 PM
Rebase after each merge
. But, I notice that when I have
ignore optional CI checks
on, I don’t get the same controls. Is there a setting where I could change the MWR behaviour?
Merge when ready
Reshef Elisha12/05/2023, 6:48 PM
When merging part of a stack,
gt restack; gt submit
, let's say I merge
, I'd expect to end up with
. 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
, 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.
gt restack; gt submit
Ella Rohm-Ensing12/05/2023, 11:42 PM
Albert12/06/2023, 9:11 AM
show whether a PR has checks busy running (or a summary of checks done / outstanding)?
Jeff Huang12/06/2023, 8:56 PM
Casper Kizewski12/07/2023, 10:06 AM
Leslie Lam12/07/2023, 11:10 PM
Noé RUBINSTEIN12/08/2023, 11:02 AM
the single commit of a PR, then
gt modify --edit
it, it should update the title of the pull request (and possibly the body but I understand this can be more finicky)