Re: [git-users] Merge without replacing the outdated data.

2014-11-18 Thread Konstantin Khomoutov
On Tue, 18 Nov 2014 05:26:08 -0800 (PST) Dmitry Moscow koktebelnig...@gmail.com wrote: I have some special task which is definitely out of everyday git practices scope. Please let me know if its possible to accomplish this with some hacks. I have two branches of development of a single

[git-users] Upload data to Git Server using Magento 1.9 and NETBeans Version8.0

2014-11-18 Thread Fernando Lucas
Hi, To whom it may concern, we are using GIT to perform code versioning when developing an e-commerce in Magento Community 1.9 with NETBeans version 8.0 as a development tool. The synchronization to download (pulling) the code from the GIT server works perfectly. All the code is downloaded

[git-users] Problems with .gitignore and the argument --separate-git-dir

2014-11-18 Thread Arnaud BONNET
hello, I moved the .git directory with the argument --separate-git-dir and since my lines in the .gitignore are no longer taken into account in order to git clone. In the info/exclude file I do not have my lines .gitignore @ ace-ace ctx $ more ~/RDS/010.git/info/exclude # Git

Re: [git-users] Scratch and GitHub

2014-11-18 Thread Gergely Polonkai
I'm not familiar with scratch, but if it saves textual (non binary) files, then you are good to go! On 18 Nov 2014 21:49, Lorena Martin lmc2...@gmail.com wrote: Hello, I am new to Git. Can I use it with the programming language Scratch? I am mentoring someone, and the mentees are supposed to