This message was deleted.
# how-do-i
s
This message was deleted.
j
gt merge
🙂
n
Distressingly absent from docs
j
ah, you're not on the latest version!
n
I upgrade wheneve prompted
Copy code
(dagster-x86-3.9.11) elementl-13in-m1-mbppro-2021:docs schrockn$ gt --version
0.22.3
j
we haven't bumped the prompt yet, the command is called
gt downstack merge
on that version
❤️ 1
in v1 we moved all the commands away from the
noun verb
model, but that version had
merge
i believe
we've been trying to be less annoying with the prompt recently
n
Personally didn’t mind the prompt, but I get why people would be
so if I upgrade to v1, you break all the
noun verb
commands?
I agree it was a discoverability hit, but scoping to
stack
,
upstack
and
downstack
is essential
j
they're not broken yet, they warn and correct
n
but like what is the replacement
j
you'll see how we handle all the commands that had different scopes —
submit --stack
still exists
n
so you have --downstack --upstack and --stack options
j
and is equivalent to a
downstack submit
by default
n
and submit defaults to branch?
j
downstack submit
and
branch submit
were essentially equivalent bc we validated that your downstack is up to date for `bs`— this is now just
submit
same for
upstack submit
and
stack submit
with
submit --stack
(which we still provide the
ss
alias for)
n
does
gt merge
use your fancy queue, or just yolo it into `master`/`main`
j
if you have the merge queue enabled for the repository, it will use that. (i don't think that you do) if the branches are stacked, it will kick off a stack merge, just like when you click the merge button in the UI, merging from bottom to top. it prints out what its about to do
n
if the branches are stacked, it will kick off a stack merge, just like when you click the merge button in the UI, merging from bottom to top. it prints out what its about to do
This is actually super opaque and magical to me which is why I don’t use it. I have no idea what it is doing and no confidence it will complete correctly. Does the
gt merge
synchronously do this with logging so I know what is actually happening?
j
drake yolo
This is actually super opaque and magical to me which is why I don’t use it. I have no idea what it is doing and no confidence it will complete correctly.
We have documentation on how this works, I believe
the UI also probably explains it in more detail than the CLI version
n
Yeah I don’t want to read docs. I want a running log of git commands.
j
it's not just git commands — we actually hit github's merge API (equivalent to clicking the merge button) in between each rebase
understood on the desire here though
n
Meaning I will read the docs the one time, but then forget about details. Would love to see live logs of whatever apis and git commands you are running.
maybe the
--debug
output has it
j
it doesn't — because it just hits our server like the merge button on our website does
the rebasing doesn't actually happen on your machine
n
ah i see
ok
j
i'm about to head into a meeting, but let's definitely chat about this at the launch party tonight because i think you're not the only one who feels this away about merge!
👍 1