hovi Posted May 28, 2021 Report Share Posted May 28, 2021 sorry my English is not good I have a file last updated at 3/30/2021, but until today I do not upload cloud ,in other words, the file update many times at local. today i want to sync cloud , it ask me resolve conflict problem. but i choose wrong version,its 3/30/2021 version so my new file is overwrite... how can i revert to the new version, today version ,please help me ....thank you so much Link to comment Share on other sites More sharing options...
calbzam Posted May 31, 2021 Report Share Posted May 31, 2021 Hello, If you resolvef a merge conflict and you cheched in the changes, now you can: 1. Remove the merge result changeset and repeat the merge, this time selecting the desired contributor to keep. 2. Use the subtractive merge operation to deintegrate the changes created in the last changeset: https://www.plasticscm.com/documentation/advanced-version-control-guide#subtractive-merge Regards, Carlos. Link to comment Share on other sites More sharing options...
Recommended Posts
Create an account or sign in to comment
You need to be a member in order to leave a comment
Create an account
Sign up for a new account in our community. It's easy!
Register a new accountSign in
Already have an account? Sign in here.
Sign In Now