PromucFlow_constructor/app/server/appsmith-server
Nayan 990e11f147
fix: Discard failing when there is a conflict with existing datasource (#26314)
## Description
Fixed the git discard failure when there is a conflict between existing
datasource name and datasource from pulled version.

#### PR fixes following issue(s)
Fixes #25954
2023-08-20 10:59:50 +06:00
..
src fix: Discard failing when there is a conflict with existing datasource (#26314) 2023-08-20 10:59:50 +06:00
auth-notes
pom.xml chore(deps): bump org.bouncycastle:bcprov-jdk18on from 1.72 to 1.74 in /app/server/appsmith-server (#25947) 2023-08-04 07:33:35 +05:30