|
If you were logged in you would be able to see more operations.
|
|
|
|
Original Estimate:
|
Unknown
|
Remaining Estimate:
|
Unknown
|
Time Spent:
|
Unknown
|
|
| Build: |
7,313
|
| Fixed in build: |
7,591
|
- from different view check out the file (not reserved co) and modify;
- from idea check out the same file, modify
- externally commit change
- commit in idea: conflict is detected. Invoke Merge
- accept the external change:
---> conflict is resolved, the file gets the new content in file system, but not in idea.
|
|
Description
|
- from different view check out the file (not reserved co) and modify;
- from idea check out the same file, modify
- externally commit change
- commit in idea: conflict is detected. Invoke Merge
- accept the external change:
---> conflict is resolved, the file gets the new content in file system, but not in idea.
|
Show » |
|
Bug
Resolved
Normal
ClearCase: on file Merge the changes are not loaded normally