I took a look at gifiletree-Merge drive and from the installation instructions alone , it blew my mind. Is there a simpler way of doing this ? Because I will have to do a separate video tutorial on command line and then another one for git configuration and customisation, I dont see how to do this in a noob friendly manner. I would prefer something that installs from inside Pharo with no use of the terminal.�� I assume my viewers are new to coding and new to Pharo. Also to create a video tutorial about something I will have first to test and try it for a considerable amount of time so I make sure that I don't introduce viewers to all sort of problems.��

A side note why I do not use gitfiletree is because I believe that is certainly a convenient tool to use but I will still rely on the external gui to visualise my commits and do things that are outside the scope of gitfiletree , so yes its a bit more tedious for simple tasks but way more efficient for more complex ones. I dont exclude though the possibility one day to come back to pharo even for my git tasks if the tools get sophisticated enough, Pharo definitely has this potential.��

But for now I would like to continue to explain what cool stuff one can do with sourcetree because its a really awesome git client.��

On Sat, Nov 29, 2014 at 10:22 AM, Thierry Goubier <thierry.goubier@gmail.com> wrote:
Le 29/11/2014 09:16, kilon alios a ��crit :
my pleasure , I am considering also creating a tutorial for fork,
branch, merge, merge conflicts, diffs and pull request which are a bit
more deep git stuff. I will try to finish it this weekend.

Great! I didn't finish the Git chapter on that :( Took me too long to setup the sample repositories for reproducable results...

Can you include the GitFileTree-MergeDriver use in there? Git merge conflicts are interesting, but it's good to know we can avoid having them (or at least some of them) in the first place ;)

Thierry

On Sat, Nov 29, 2014 at 9:46 AM, stepharo <stepharo@free.fr
<mailto:stepharo@free.fr>> wrote:

�� �� thanks I added it to pharo weekly

�� �� http://pharoweekly.wordpress.__com/2014/11/29/github-for-__pharo-using-sourcetree-video-__by-kilon-alios/
�� �� <http://pharoweekly.wordpress.com/2014/11/29/github-for-pharo-using-sourcetree-video-by-kilon-alios/>

�� �� Le 27/11/14 21:46, kilon alios a ��crit :

�� �� �� �� Hello pharoers , at last , my video tutorial for those that are
�� �� �� �� not familiar with git and github, has been uploaded to YouTube.
�� �� �� �� I describe the very basics of the process and give you enough
�� �� �� �� information to create a github repository, clone the online
�� �� �� �� repository to your hard driver and use the hard drive copy to
�� �� �� �� commit changes to your code, upload and download your commits to
�� �� �� �� and from your github repo . I use sourcetree to make the
�� �� �� �� interaction with git as gui based as you are used with Pharo.

�� �� �� �� The tutorial can be watched here

�� �� �� �� https://www.youtube.com/watch?__v=n2WNYDtO0cE
�� �� �� �� <https://www.youtube.com/watch?v=n2WNYDtO0cE>

�� �� �� �� and these are the relevant links for whatever is used in the
�� �� �� �� tutorial

�� �� �� �� Git
�� �� �� �� http://git-scm.com

�� �� �� �� GitHub
�� �� �� �� https://github.com/

�� �� �� �� Sourcetree
�� �� �� �� http://www.sourcetreeapp.com

�� �� �� �� SmartGit
�� �� �� �� http://www.syntevo.com/__smartgit <http://www.syntevo.com/smartgit>

�� �� �� �� if you have any issue , problem and compliant, dont be shy,
�� �� �� �� share it :)