https://github.com/pulipulichen/pwa-git-conflict-resolver

PWA-Git-Conflict-Resolver is an progressive web application designed to resolve conflicts in Git version control. As a Progressive Web App (PWA), it allows users to seamlessly use it on any device, providing an intuitive interface to assist in resolving code merge conflicts.
https://github.com/pulipulichen/pwa-git-conflict-resolver

git puli-portfolio pwa semantic-ui vuejs

Last synced: 2 months ago
JSON representation

PWA-Git-Conflict-Resolver is an progressive web application designed to resolve conflicts in Git version control. As a Progressive Web App (PWA), it allows users to seamlessly use it on any device, providing an intuitive interface to assist in resolving code merge conflicts.

• Host: GitHub
• URL: https://github.com/pulipulichen/pwa-git-conflict-resolver
• Owner: pulipulichen
• License: mit
• Created: 2024-06-01T11:20:19.000Z (about 2 years ago)
• Default Branch: main
• Last Pushed: 2024-06-03T21:50:33.000Z (about 2 years ago)
• Last Synced: 2026-04-16T21:42:03.695Z (3 months ago)
• Topics: git, puli-portfolio, pwa, semantic-ui, vuejs
• Language: CSS
• Homepage: https://pulipulichen.github.io/PWA-Git-Conflict-Resolver/
• Size: 5.08 MB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE
  • Citation: CITATION.cff

Awesome Lists containing this project

README

          
[![DOI](https://zenodo.org/badge/808990689.svg)](https://zenodo.org/doi/10.5281/zenodo.11409295)

# PWA-Git-Conflict-Resolver: 一個用於解決Git衝突的網頁工具。

PWA-Git-Conflict-Resolver is an progressive web application designed to resolve conflicts in Git version control. As a Progressive Web App (PWA), it allows users to seamlessly use it on any device, providing an intuitive interface to assist in resolving code merge conflicts.

PWA-Git-Conflict-Resolver 是一個PWA網頁工具，專門設計用於解決Git版本控制中的衝突問題。此應用程式以PWA（進階Web應用程式）的形式提供，讓使用者可以在任何裝置上流暢使用，並且提供簡單的介面來輔助解決代碼合併衝突。

![](https://blogger.googleusercontent.com/img/a/AVvXsEiGa27-k8X8pd83T78S-iI7BA8SJ3cXp6WHRm01sC26OJNC-58Lg1y_fYCfZt2YjX3a1ZxwIKsLEBvakSeheF4itVQT5gUqseSeC0AXDA08Zyu1OlPM4V6MopsfZ--mCdhVS8tjONh6t8JChDbsl9lHXM0GDzywDzY3-HbsvufBFeVNVdpQv4Ul9g)

# Online Tool

https://pulipulichen.github.io/PWA-Git-Conflict-Resolver/

# Key Techniques

- **Progressive Web App (PWA)**: 可安裝在電腦或手機上的網頁架構設計。

- **Vue.js**: MVVM的控制框架。

- **Semantic UI**: 現代網頁的RWD樣式框架。

# Citation

Chen, Y.-T. (2024). *PWA-Git-Conflict-Resolver* (20240601.205043) [Computer software]. Zenodo. [https://doi.org/10.5281/ZENODO.11409295](https://doi.org/10.5281/ZENODO.11409295)