Started by cibret24, February 26, 2021, 11:57:50 AM
Quote from: xiaoqi on March 10, 2021, 00:07:17 AMHowever, tried to test this with one of my colleague, got one problem need your advise on "merging", both of us have modified some parts in the online model and committed, when open the model, the conflict need to be solved, but it only allow to choose either "local" or "remote", while for some part, as they're touching same folder, shall we allow accept "both"? Or any suggestion that possible I'm not finding the proper way of using?
Quote3. When one create one View folder, and move one view to this new created folder, while at the same time, the other changed the view and publish, the former one got merge alert, if we choose to use "the other", the changed view again appears as expected in the root folder, but the "me" moved view is not deleted (since location is changed) and even worse this "not deleted" view is disconnected from git and not shows in the file manager's folder structure.
QuoteWhy everytime run "refresh", coArchi pop up dialog asking for "commit", even at the time there's nothing changed.
QuoteIf one made change / commit / publish, while the other made changes to same element, merging alert pop up correctly, but after chose either my or remote, the model's commit (both changes and merge) are not publish to remote repo, have to do another valid commit again then the aging commit can be pushed.