From master I have created a custome and release branches. Created feature branch from custome branch. Release branch created from feature branch. from feature branch deleted all unwanted files, worked on the which are need to be modified. Because I performed delete operation whenever I tried to merge it to the code release or custom branches the old code is also deleted from release and custome branches. Up to now I ma good with this scenario but when i merging the code release to master, here I need all files including deleted files should merge on master.
in feature and release branch i need only modified code, other files should remove. but in master i want all files with latest code. master: F1, F2 feature: F1, F2 I added a file f3 and deleted the f1,f2 file. After this I commit/push the code remote feature. after this only f3 file will be on remote location. then I merged the code to release branch. after merging and push code from release local to remote release, the status in remote is only f3. Up to now its reaches my expectation. But after merging the code from release to master I need f3 file along with old files in master. Actual master result: only f3 file we can see in remote after merging the code from release. expecting result in master: f3 file along with deleted file f1 and f2. so is there any solution that we can ignore the deletion operation while merging the code release to master. Thanks, M Kumari.