update

README.md

@@ -135,3 +135,15 @@ If you encounter authentication errors like "could not read Username", try these
 - **"No such device or address"**: Usually means Git is trying to prompt for credentials interactively
 - **"Authentication failed"**: Check your Personal Access Token and repository permissions
 - **"Repository not found"**: Verify the repository URL and your access permissions
+- **"Updates were rejected because the remote contains work"**: The script now automatically handles this by:
+  1. Stashing local changes
+  2. Pulling latest changes from remote
+  3. Applying stashed changes
+  4. Retrying the push
+
+### Conflict Resolution
+
+The script automatically handles common Git conflicts:
+- **Remote ahead of local**: Automatically pulls latest changes before pushing
+- **Merge conflicts**: Uses git stash to preserve changes, then pulls and reapplies
+- **Unrelated histories**: Uses `--allow-unrelated-histories` flag for initial setup