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 <[email protected] <mailto:[email protected]>> 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 :)
