You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.
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
Create release branch using git flow release start <> from develop branch
Commit a change in develop branch adding FeatureFile1.mm
Cherry-pick this change into release branch
Commit a change in release branch that deletes the FeatureFile1.mm from release branch
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
The text was updated successfully, but these errors were encountered:
Prerequisites
Debug -> Reload Without Extensions
?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
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) orBrackets -> About Brackets
(macOS)MacOS
The text was updated successfully, but these errors were encountered: