<PurpleSym>Serious question: How come `git pull` is considered “fancy”? Whenever I try to `git am` some patches from the bugtracker, it almost never works without manual intervention. (Ignoring that non-emacs-users have to save them somewhere first.)
<civodul>PurpleSym: i think it's a matter of taste and habit
<civodul>many people are used to the GitHub way of doing things so that's what works best for them
<civodul>conversely, some of us here see as a hindrance anything that forces them to leave their Emacs or their terminal
<PurpleSym>Hm, for me the “GitHub way” would be clicking their green button to merge a pull request. Not running `git pull <uri> <branch>`.
<dstolfa>PurpleSym: well, yes and no... if you have to test the changes it's a tad annoying
<PurpleSym>dstolfa: What exactly do you feel is annoying?
<dstolfa>PurpleSym: having to pull a branch from a separate remote -- it's not great if you're trying to build up a set of patches from multiple sources because you end up with a bunch of branches locally
<dstolfa>i find `git am` much more user-friendly in that case
<PurpleSym>So you first add a new remote for each repo via `git remote`, do a `git fetch` and then `git merge`/`git pull`?
<dstolfa>PurpleSym: depending on the size of the changes, scope, etc, yeah
<dstolfa>the pull request workflow has its advantages in certain cases, but it's annoying in others. no perfect answer, as always :(
<PurpleSym>How do you deal with merge conflicts properly with `git am`?
<dstolfa>PurpleSym: heh, good question. i usually just fix it in the commit that has it, but i don't know if anyone has a better way of dealing with it
<PurpleSym>For `git am` I don’t have a good solution either unfortunately.
<zimoun>civodul: about JCAD, do you know the slot about “Démonstration”?
<zimoun>PurpleSym: well, I think it is about habits. I find simpler to open a terminal and run “libreoffice bla” than click to menu etc. Because these menus change from an environment to another and the terminal way is the same everywhere anytime. For MR or PR, it is a bit the same. Sometimes the button is top-right, sometime down-left, etc. And because I do it once in a while, each time, I am lost. Then I do not have
<zimoun>my tools at hand when something is going wrong. Well, it is about habits. :-)
<civodul>PurpleSym: git am --show-current-patch=diff | patch -p1 :-)