git ssb

Check out the branch and test the changes: git fetch > ssb://%MONB7+ExOh8VpFJRkTpot3OiI5/zklCaEjyqdz6l0Zo=.sha256 error-handling
git checkout -b error-handling FETCH_HEAD
Merge the changes and push to update the base branch: git checkout master
git merge error-handling
git push ssb master

why fetch and not pull? to be honest, when I use github I usually just pull directly... using 3 commands to do one thing, is a bit... redundant...

the instructions assume you want to examine or test the changes at the PR's head commit. perhaps this is not necessary.

pull <remote> <branch> triggers merging into the current branch, while fetch <remote> <branch> does not trigger a merge.

if we assume you review changes in the web UI and test changes after merging them locally, the steps could be simplified to pull and then push:

Merge via command line…

git pull ssb://%MONB7+ExOh8VpFJRkTpot3OiI5/zklCaEjyqdz6l0Zo=.sha256  error-handling
git push ssb

Do you think this needs any other explanatory text?

it confused me for a second because it's different to github, but then I realized that this way is actually much better. Here I can get exactly the code in your PR, check that it is right, then look at how it merges with the code I have. github shows you how to merge into another branch, which is okay. I just wish it was only one command. git import or something.

the idea is to checkout the PR. Is there a way to git checkout -b but also pull a remote branch?

Is there a way to git checkout -b but also pull a remote branch?

not that i know of. lately with github I have used the hub command hub pr <pr_num> which does this. we could perhaps have a command like git ssb pr <pr_id> which would pull and checkout a pull request branch.

hmm, yeah that would work.

Closing as part of cleanup. If anyone thinks the merge instructions should still be different, feel free to open another issue or reopen this one.