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

2014-11-19 Thread Dmitry Moscow
Konstantin, looks like I am missing something. I got to branch A which I want to 'merge' (preserving the differencies) with branch B. I run git read-tree -m HEAD branch B I get a number of files updated and added in my working folder. Files that were absent in branch A are added, the

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

2014-11-19 Thread Konstantin Khomoutov
On Tue, 18 Nov 2014 12:46:56 -0800 (PST) Fernando Lucas ferna...@4ward.com.br wrote: 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

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

2014-11-19 Thread Dale R. Worley
From: Dmitry Moscow koktebelnig...@gmail.com I got to branch A which I want to 'merge' (preserving the differencies) with branch B. I run git read-tree -m HEAD branch B I get a number of files updated and added in my working folder. Files that were absent in branch A are added, the

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

2014-11-19 Thread Dale R. Worley
From: Arnaud BONNET abo...@gmail.com Process used: 1- Creation of deposit (made with the user ace) 1- cd /home/ace/RDS/010 2 git init --separate-git-dir=/home/ace/RDS/010.git 3 echo *% /home/ace/RDS/010.git/.gitignore 4 echo * ~ /home/ace/RDS/010.git/.gitignore