Back merge failed show deleted file

[core-ai-bot]

Issue by spashivaa
Saturday Jul 24, 2021 at 14:21 GMT
Originally opened as adobe/brackets#15366

---

Prerequisites

• [YES ] Can you reproduce the problem with Debug -> Reload Without Extensions?
• [NO ] Did you perform a cursory search to see if your bug or enhancement is already reported?
• [NO ] Did you read the Troubleshooting guide?

For more information on how to write a good bug report read here
For more information on how to contribute read here

Description

[Cherry-Pick commit from develop contains a new feature file deleted in release - back merge fails to show diff]

Steps to Reproduce

1. Create release branch using git flow release start <> from develop branch
2. Commit a change in develop branch adding FeatureFile1.mm
3. Cherry-pick this change into release branch
4. Commit a change in release branch that deletes the FeatureFile1.mm from release branch
5. Back merge the changes from release branch - Release branch contains the FeatureFile1.mm or even diff of release branch and develop branch before merge does not show the file is deleted. This could be due to the file added in release branch (using cherry-pick commit change) and deleted then in next commit. So no change in release branch ?! Is this how the tool works?
   Can a way to show a conflict of file deleted in release and exist in develop branch. Because the release branch merged with master branch correctly not in develop branch

Expected behavior: [What you expected to happen]
Back merge should delete the file from develop branch or show a conflict to user to decide

Actual behavior: [What actually happened]
No conflict and develop branch contains the deleted file

Versions

Please include the OS and what version of the OS you're running.
Please include the version of Brackets. You can find it under Help -> About Brackets (Windows and Linux) or Brackets -> About Brackets (macOS)

MacOS