Anagh Hegde a7b1902afd feat: handle error messages for merge action (#9030) ... * Handle merge conflicts * Fix test failures * Move branch name from request params to body for merge operation * Use request body for branchNames		2021-11-12 10:04:29 +00:00
..
main/java/com/appsmith/external	feat: handle error messages for merge action (#9030)	2021-11-12 10:04:29 +00:00
test/java	fix: [Filter Library]Prepared Statements doesn't set value if the data type is not supported in H2. Defaulting to String for unsupported types. (#8015)	2021-09-30 15:48:52 +00:00