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
..
java/com/appsmith/git	feat: handle error messages for merge action (#9030)	2021-11-12 10:04:29 +00:00
resources	feat: git merge status (#8692)	2021-10-22 12:31:13 +00:00