[Bug] Merging on Appsmith causes the changes in merge commit to be reverted and shown as un-comitted changes

appsmithorg / appsmith

Platform to build admin panels, internal tools, and dashboards. Integrates with 25+ databases and any API.

https://www.appsmith.com

Apache License 2.0

33.95k stars 3.66k forks source link

Open infinitetrooper opened 1 month ago

infinitetrooper commented 1 month ago

Steps

Create a branch called feat from develop
Make changes in feat branch
Merge feat to develop
develop will show the changes merged in merge commit as uncommitted changes
If these changes are committed, then all development from feat branch will be destroyed

More in this recording and this is the commit in question

github-actions[bot] commented 1 month ago

We have found issues that are potential duplicates:

[#35822] [Bug] Merging on Appsmith causes the changes in merge commit to be reverted and shown as un-comitted changes (100%) If any of the issues listed above are a duplicate, please consider closing this issue & upvoting the original one.
Alternatively, if neither of the listed issues addresses your feature/bug, keep this issue open.