Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Merge deleting folders and files
Merge deleting folders and files [message #1312082] Thu, 24 April 2014 04:57 Go to next message
Dhanesh Koliyat is currently offline Dhanesh Koliyat
Messages: 2
Registered: January 2013
Junior Member
I've created a branch 2.1.1 from master branch. And created one more branch 2.2.0 from master branch. Both the branch had the same code while branching. Then I've added a folder "Migration/V_2_1_1" inside 2.1.1 branch and "Migration/V_2_2_0" inside 2.2.0 branch. Now I wanted to merge 2.1.1 branch to 2.2.0 branch. I tried to merge. The result was really shocking..!! "Migration/V_2_2_0" folder got deleted and "Migration/V_2_1_1" was added in 2.2.0 branch. Where in the expected behavior was Adding "Migration/V_2_1_1" to 2.2.0 branch(It should not have deleted the existing folder). Can anybody help me out to find out a solution for this?
Re: Merge deleting folders and files [message #1315501 is a reply to message #1312082] Sat, 26 April 2014 01:21 Go to previous message
Matthias Sohn is currently offline Matthias Sohn
Messages: 588
Registered: July 2009
Senior Member
Which version are you using

Git doesn't version empty folders, so how can you add an empty folder in a branch ?
If these folders weren't empty how did you "add them inside a branch" ?
Please provide exact steps to reproduce.
Previous Topic:.git/description use as git repo name
Next Topic:jgit Ref for a relative references
Goto Forum:
  


Current Time: Sun Oct 26 09:49:10 GMT 2014

Powered by FUDForum. Page generated in 0.03248 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software