RE: git merge deletes my changes

2016-10-12 Thread Eduard Egorov
iling list. This is another time I can evidence the power and flexibility the git provides, thank you all for your great work! With best regards Eduard Egorov -Original Message- From: Jakub Narębski [mailto:jna...@gmail.com] Sent: Tuesday, October 11, 2016 6:57 PM To: Paul Smith; Eduard E

RE: git merge deletes my changes

2016-10-11 Thread Eduard Egorov
works-incorrectly ) - I will accept it with great pleasure ;-) With best regards Eduard Egorov -Original Message- From: Paul Smith [mailto:p...@mad-scientist.net] Sent: Monday, October 10, 2016 8:52 PM To: Eduard Egorov ; 'git@vger.kernel.org' Subject: Re: git merge deletes my cha

RE: git merge deletes my changes

2016-10-10 Thread Eduard Egorov
se repos doesn't has any relations, right). Can somebody confirm this please? Doesn't "merge -s subtree" really merges branches? With best regards Eduard Egorov -Original Message- From: Eduard Egorov Sent: Monday, October 10, 2016 12:39 PM To: 'git@vger.kernel.org&#x

git merge deletes my changes

2016-10-10 Thread Eduard Egorov
his behavior. Could you help me please? What information can I provide in order to troubleshoot this issue? A post on SO: http://stackoverflow.com/questions/39954265/git-merge-deletes-my-changes With best regards Eduard Egorov