Slackbot
12/12/2023, 3:38 PMJordan Nunez
12/12/2023, 6:34 PMgt undo restack
. I want to undo last restack and change my local state to its previos version stack. useful for the infrequent – but not rare – base rebaseSlackbot
12/12/2023, 8:32 PMSlackbot
12/12/2023, 8:51 PMSlackbot
12/12/2023, 9:30 PMSlackbot
12/12/2023, 9:37 PMSlackbot
12/12/2023, 10:04 PMSlackbot
12/13/2023, 5:30 PMElla Rohm-Ensing
12/13/2023, 5:59 PMgt checkout
doesn't pass through to git checkout
. I would love though if it could be used with the --ours
/ --theirs
option for resolving rebases, since restacking often ends up in resolving merge conflicts this waySlackbot
12/13/2023, 7:01 PMMartin Ek
12/14/2023, 4:47 AMMerge when ready
with the merge queue it waits with rebasing a pull request until the build has succeeded. This seems like a reasonable conservative choice but it would be nice to be able to tell it to rebase as soon as it sees that the PR is out of date with main so that if all the tests are going to pass it will be ready to merge sooner rather than later (i.e., having to wait for only one set of tests to run instead of two)Slackbot
12/14/2023, 10:11 AMSlackbot
12/14/2023, 10:02 PMSlackbot
12/14/2023, 10:32 PMSlackbot
12/15/2023, 9:07 AMSlackbot
12/15/2023, 10:02 AMfinn
12/16/2023, 3:30 PMgt mergetool
should redirect the command to git mergetool
Slackbot
12/18/2023, 1:32 PMSlackbot
12/19/2023, 2:02 PMSlackbot
12/19/2023, 3:27 PMVignesh Murugesan
12/19/2023, 9:26 PMn
. Instead I suggest an approach that is popularized by tools like lazygit where a list of all the changed files are shown and you allow selecting the files (and offer selecting hunks within that file) that should go into the commit. This makes it a lot more easier to manage a large number of changes. Thanks!Arjit Jaiswal
12/19/2023, 10:04 PMSlackbot
12/20/2023, 3:09 AMSlackbot
12/20/2023, 2:40 PMSlackbot
12/21/2023, 5:28 AMSlackbot
12/21/2023, 8:18 AMSlackbot
12/21/2023, 10:05 AMSlackbot
12/21/2023, 11:45 AMJoyce Lu
12/21/2023, 5:32 PMJoyce Lu
12/21/2023, 5:32 PM