Question about the management of the pull requests

[Christophe Bal]

Hello.

I'm learning git and I have a question abut the way the core developers of sympy manages the multiple pull requests with potential conflict. How do you do that ?

Christophe BAL

Enseignant de mathématiques en Lycée et développeur Python amateur

---

French math teacher in a "Lycée" and Python amateur developer

[Aaron Meurer]

If there is a known dependency, you can base one branch on top of another.

In general, though, if two pull requests are making incompatible
changes, the one merged second will have to fix the merge conflicts.

Aaron Meurer

> --
> You received this message because you are subscribed to the Google Groups
> "sympy" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to sympy+un...@googlegroups.com.
> To post to this group, send email to sy...@googlegroups.com.
> Visit this group at http://groups.google.com/group/sympy.
> To view this discussion on the web visit
> https://groups.google.com/d/msgid/sympy/CAAb4jGk-3A4mX1o3u87HQ34DK09wR7cc1zHveqGAUBtb4DUAhA%40mail.gmail.com.
> For more options, visit https://groups.google.com/d/optout.

[Francesco Bonazzi]

On Wednesday, April 1, 2015 at 11:35:40 PM UTC+2, Christophe Bal wrote:

I'm learning git [ ... ]

I suggest to use PyCharm, it's an excellent Python development environment, plus it has a very comfortable integration with github:
https://www.jetbrains.com/pycharm/help/using-github-integration.html

[Christophe Bal]

Thanks for the answers.

Indeed I was hoping that git can manage multi pull requests. If it is not case, Il will build a python scripts such to play with the git --stat outputs. 

Now that I know a little git, I will try to participate as soon as possible.

Thanks for pycharm but I prefer to use atom.

Christophe BAL

Enseignant de mathématiques en Lycée et développeur Python amateur

---

French math teacher in a "Lycée" and Python amateur developer

--

You received this message because you are subscribed to the Google Groups "sympy" group.
To unsubscribe from this group and stop receiving emails from it, send an email to sympy+un...@googlegroups.com.
To post to this group, send email to sy...@googlegroups.com.
Visit this group at http://groups.google.com/group/sympy.

To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/519eb700-a49f-40c3-a7e0-420549de1ce9%40googlegroups.com.

[Joachim Durchholz]

Am 02.04.2015 um 11:30 schrieb Christophe Bal:
> Thanks for the answers.
>
> Indeed I was hoping that git can manage multi pull requests. If it is not
> case, Il will build a python scripts such to play with the git --stat
> outputs.

Wait until you have seen some actual merge conflicts :-)

It's not usually an issue.
Not unless you do something cross-cutting that touches many modules. And
even then it does not happen very often that two people touch related
lines of code.

> Now that I know a little git, I will try to participate as soon as possible.

That's enough to participate. git expertise comes with use (that's more
true for git than for many other tools).

> Thanks for pycharm but I prefer to use atom.

No problem with that.

[Ondřej Čertík]

Hi Christophe,

I would also mention that you can access the PRs from git. I have this
in ~/.gitconfig:

[alias]
pr = !sh -c 'git fetch origin pull/$1/head:pr-$1 && git checkout pr-$1' -

Then you can checkout any PR as follows:

ondrej@eagle:~/repos/sympy(master)$ git pr 9234
remote: Counting objects: 161, done.
remote: Compressing objects: 100% (67/67), done.
remote: Total 161 (delta 80), reused 52 (delta 52), pack-reused 42
Receiving objects: 100% (161/161), 165.97 KiB | 0 bytes/s, done.
Resolving deltas: 100% (85/85), done.
From https://github.com/sympy/sympy
* [new ref] refs/pull/9234/head -> pr-9234
* [new tag] sympy-0.7.6 -> sympy-0.7.6
* [new tag] sympy-0.7.6.rc1 -> sympy-0.7.6.rc1
* [new tag] sympy-0.7.6.rc2 -> sympy-0.7.6.rc2
Switched to branch 'pr-9234'
ondrej@eagle:~/repos/sympy(pr-9234)$


So you can checkout two PRs and use git to investigate. You can use git --stat.

Ondrej

[Aaron Meurer]

You can also add something to your ./git/config to always fetch these
https://gist.github.com/piscisaureus/3342247

I recommend using the hub command for better integration with git and github.

Aaron Meurer

> --
> You received this message because you are subscribed to the Google Groups "sympy" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to sympy+un...@googlegroups.com.
> To post to this group, send email to sy...@googlegroups.com.
> Visit this group at http://groups.google.com/group/sympy.

> To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CADDwiVBNUvwtRmHBjNFQLyEeE3dQj8pFumB%2BRULYVgNOS%2BDDEg%40mail.gmail.com.

[Christophe Bal]

Hello.

Thanks a lot for the guru's tips about local PRs.

Christophe BAL

Enseignant de mathématiques en Lycée et développeur Python amateur

---

French math teacher in a "Lycée" and Python amateur developer

To view this discussion on the web visit https://groups.google.com/d/msgid/sympy/CAKgW%3D6KTtHAbRj52%2BGkpX-dNFPP2HZ4rcXDAJ9rkoCdMwPVApQ%40mail.gmail.com.