I had a merge issue once, but merge issues are normal never saw them as problem and with the git gui client I am using it took me a few seconds to resolve.

I have not done a pull request but I do not see why I would have any problem

There is also a filetree version without any metadata if I remember correctly that I always wanted to give a try but because I know how to avoid merge issues I never had good enough reason to give it a try.

In case of merge issue its just about choosing which version will overwrite the other one which is something my git gui client handles automagically with minimum input from me

On Sun, Jan 8, 2017 at 3:50 PM Alexandre Bergel <alexandre.bergel@me.com> wrote:

No issues when merging? What about pull-request?

Alexandre

> On Jan 8, 2017, at 10:40 AM, Dimitris Chloupis <kilon.alios@gmail.com> wrote:
>
> has worked perfect for , definetly a tons better than sthub and squeaksource and definitely more stable . I do not think I ever experienced a single problem with git and pharo.
>
> On Sun, Jan 8, 2017 at 3:19 PM Stephan Eggermont <stephan@stack.nl> wrote:
> On 08/01/17 12:54, Dimitris Chloupis wrote:
> > Squeaksource ?
> >
> > Was it not made read only ?
>
> It was fixed and seems to be reliable with the current load
> ss3 was always stable
>
> > It's been ages since I last visited sthub and ss3 , I thought you guys
> > would have moved to github by now or some alternative that is far stable
> > than sthub
>
> No, git support is still bleeding edge. A few times a year I check the
> progress made. Not everything can move to github, and some things need
> support on older versions and other platforms, and it needs to work
> everywhere. Not there yet.
>
> Stephan
>
>
>

--
_,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:
Alexandre Bergel�� http://www.bergel.eu
^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;._,.;:~^~:;.