Advanced Git Merge #161
Labels
enhancement
New feature or request
significant
Intended to denote large changes that Fang and Michael to undertake befor the main release
We would like a merge system which creates a pop-up window whenever there are merge conflicts that allows the user to resolve the conflicts easily within our app.
The text was updated successfully, but these errors were encountered: