Search the Community
Showing results for tags 'conflict'.
Found 1 result
I'm familiar with other SCM but just learning how to use Plastic - specifically the Gluon frontend. During our tests we engineered a situation where a file had been checked-out and changed by A and then deleted by B. As expected this leads to a conflict in Gluon when A attempts to check-in the changed file. What are the options allowed by Gluon to solve this conflict? We are able to lose the local changes and have the file remain deleted but is it possible to override the deletion with the local content changes and if so how?