fix: Merge conflicts in newly created apps

website/docs/advanced-concepts/version-control-with-git/commit-and-push.md

@@ -105,6 +105,51 @@ If you face conflicts within the same branch due to changes made remotely, open
 
 </dd>
 
+## New app merge Conflicts
+
+
+When creating a new app and connecting it to a Git repository, merge conflicts may occur during the initial merge into the `master` branch. These steps are intended for self-hosted Appsmith users with access to the backend file system. If you are using a cloud-hosted version, these steps do not apply. 
+
+1. Open and Navigate to the Git Directory: `appsmith-stacks/git-storage/<workspace-id>/<application-id>`.
+
+<dd> 
+
+- **Workspace ID**: Open the Appsmith UI, navigate to the workspace, and find the `workspaceId` in the browser URL, like:
+
+<dd>
+
+```js
+https://internal.appsmith.com/applications?workspaceId=<workspace_id>
+```
+
+</dd>
+
+- **Application ID**: Edit the app, open the Network tab in developer tools, filter by `consolidated`, and copy the `applicationId` from the response. 
+
+</dd>
+
+
+2. Ensure Git is installed on your system. If it is not already installed, use the following command to install it:
+
+<dd>
+
+```bash
+apt-get update && apt-get install git
+```
+
+</dd>
+
+3. Navigate to the application directory (`appsmith-stacks/git-storage/<workspace-id>/<application-id>`) and execute the following command to perform a hard reset:
+
+<dd>
+
+```bash
+git reset origin/master --hard
+```
+
+</dd>
+
+4. Open the app displaying the conflict. From the commit modal, click the **+** icon and select **Discard and Pull**. This action removes unsaved local changes and updates your app with the latest changes from the remote branch.
 
 ## See also