git-sync/profilarr

mirror of https://github.com/Dictionarry-Hub/profilarr.git synced 2026-01-22 10:51:02 +01:00

Files

History

Sam Chau ca84a1c95b feature: merge conflict detection and resolution (#6 )

- pulls now correctly identify merge conflicts and enter a merge state
- user resolves each file individually
- commit resolve merge state
- allows users to keep custom changes and pull in updates
- improve commit message component
- seperated commit / add functionality

2025-02-05 16:09:58 +10:30

..

feat: Add clone button with SVG icon to FormatCard component

2025-02-05 16:09:58 +10:30

feature: merge conflict detection and resolution (#6 )

2025-02-05 16:09:58 +10:30

.gitignore

feat(backend): Major overhaul of backend structure, git integration, and settings management

2025-02-05 16:09:58 +10:30

Dockerfile

chore(dev): Improve Vite hot reloading in Docker environment

2025-02-05 16:09:58 +10:30

eslint.config.js

Initial Commit

2025-02-05 16:09:58 +10:30

index.html

feature: merge conflict detection and resolution (#6 )

2025-02-05 16:09:58 +10:30

package-lock.json

refactor(nav): Implement React Router for navigation

2025-02-05 16:09:58 +10:30

package.json

refactor(nav): Implement React Router for navigation

2025-02-05 16:09:58 +10:30

postcss.config.js

Initial Commit

2025-02-05 16:09:58 +10:30

README.md

Initial Commit

2025-02-05 16:09:58 +10:30

tailwind.config.js

Refactor backend, enhance Git functionality, and improve UI/UX (#2 )

2025-02-05 16:09:58 +10:30

vite.config.js

chore(dev): Improve Vite hot reloading in Docker environment

2025-02-05 16:09:58 +10:30

README.md

React + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

@vitejs/plugin-react uses Babel for Fast Refresh
@vitejs/plugin-react-swc uses SWC for Fast Refresh