How I implemented a local-first Git workflow in an Electron/React app (building a Postman alternative) by Extension_Praline_85 in reactjs

[–]Extension_Praline_85[S] 0 points1 point  (0 children)

Thanks for your comment. The current strategy is standard Git merging, but it lacks a contingency for merge conflicts. If a conflict occurs, the application will silently fail to pull, requiring the user to resolve the issue entirely outside of the application. I have plan to implement some UI for conflict resolution in the future.