Jump to content

Cannot merge selected items in Plastic 4.0 while we can do it in Plastic 3.0


diegobowen

Recommended Posts

You've the option available for "file conflicts", not structural changes.

It means: you add a file or remove it: you can't merge it in isolation, you really need to go through the entire structural change.

It is only available for conflicts, so you can decide when you want to solve them (not available if you just changed a file on the source branch).

We went through a full refactor in 4.0. Merge is now more capable than ever (conflicts that are now managed were simply out of the scope before) and also much faster.

We changed merge tracking from the item level to the changeset level too, which means it is faster, but partial merge is not available anymore. We're working on alternatives though.

Link to comment
Share on other sites

Archived

This topic is now archived and is closed to further replies.

×
×
  • Create New...