Instant Reverse - Visual Paradigm
Instant Reverse - Visual Paradigm Instant Reverse - Visual Paradigm
SDE-VS User’s Guide (Part 1) Chapter 14 – Team Collaboration with CVS Repository Update Model(s) dialog box is displayed. The models changed by others are shown. Click OK to update. Reverting Project Figure 14.23 - Update Model(s) dialog box You may encounter a situation when you have made a lot of changes in the project just to find there are a lot of mistakes. In this case, you may want to rollback all the changes and redo the whole project. Here, you can revert all local changes by clicking the Revert button. Figure 14.24 - Revert project A dialog box will show and ask if you want to revert. Click Yes to confirm and the project will be reverted. Figure 14.25 - Confirm revert project 14-11
SDE-VS User’s Guide (Part 1) Chapter 14 – Team Collaboration with CVS Repository Resolving Conflict Sometimes, you may modify the same model as your teammate with different changes. In this case, the server will not know which revision should be preserved and it will show a conflict. Conflicts may happen when you commit the project. 14-12 Figure 14.26 - Conflict found in merging Conflict may also happen when you update your project. Figure 14.27 - Conflict found in updating
- Page 323 and 324: SDE-VS User’s Guide (Part 1) Chap
- Page 325 and 326: SDE-VS User’s Guide (Part 1) Chap
- Page 327 and 328: SDE-VS User’s Guide (Part 1) Chap
- Page 329 and 330: SDE-VS User’s Guide (Part 1) Chap
- Page 331 and 332: SDE-VS User’s Guide (Part 1) Chap
- Page 333 and 334: SDE-VS User’s Guide (Part 1) Chap
- Page 335 and 336: SDE-VS User’s Guide (Part 1) Chap
- Page 337 and 338: SDE-VS User’s Guide (Part 1) Chap
- Page 339 and 340: SDE-VS User’s Guide (Part 1) Chap
- Page 341 and 342: SDE-VS User’s Guide (Part 1) Chap
- Page 343 and 344: SDE-VS User’s Guide (Part 1) Chap
- Page 345 and 346: SDE-VS User’s Guide (Part 1) Chap
- Page 347 and 348: SDE-VS User’s Guide (Part 1) Chap
- Page 349 and 350: SDE-VS User’s Guide (Part 1) Chap
- Page 351 and 352: SDE-VS User’s Guide (Part 1) Chap
- Page 353 and 354: SDE-VS User’s Guide (Part 1) Chap
- Page 355 and 356: SDE-VS User’s Guide (Part 1) Chap
- Page 357 and 358: SDE-VS User’s Guide (Part 1) Chap
- Page 359 and 360: SDE-VS User’s Guide (Part 1) Chap
- Page 361 and 362: SDE-VS User’s Guide (Part 1) Chap
- Page 363 and 364: SDE-VS User’s Guide (Part 1) Chap
- Page 365 and 366: SDE-VS User’s Guide (Part 1) Chap
- Page 367 and 368: SDE-VS User’s Guide (Part 1) The
- Page 369 and 370: SDE-VS User’s Guide (Part 1) Chap
- Page 371 and 372: SDE-VS User’s Guide (Part 1) Chap
- Page 373: SDE-VS User’s Guide (Part 1) Chap
- Page 377 and 378: SDE-VS User’s Guide (Part 1) You
- Page 379 and 380: SDE-VS User’s Guide (Part 1) Chap
- Page 381 and 382: SDE-VS User’s Guide (Part 1) Chap
- Page 383 and 384: SDE-VS User’s Guide (Part 1) Chap
- Page 385 and 386: SDE-VS User’s Guide (Part 1) Chap
- Page 387 and 388: SDE-VS User’s Guide (Part 1) Chap
- Page 389 and 390: SDE-VS User’s Guide (Part 1) Chap
- Page 391 and 392: SDE-VS User’s Guide (Part 1) Chap
- Page 393 and 394: SDE-VS User’s Guide (Part 1) Chap
- Page 395 and 396: SDE-VS User’s Guide (Part 1) Chap
- Page 397 and 398: SDE-VS User’s Guide (Part 1) Chap
- Page 399 and 400: SDE-VS User’s Guide (Part 1) Chap
- Page 401 and 402: SDE-VS User’s Guide (Part 1) Chap
- Page 403 and 404: SDE-VS User’s Guide (Part 1) Chap
- Page 405 and 406: SDE-VS User’s Guide (Part 1) Chap
- Page 407 and 408: SDE-VS User’s Guide (Part 1) Chap
- Page 409 and 410: SDE-VS User’s Guide (Part 1) Chap
- Page 411 and 412: SDE-VS User’s Guide (Part 1) Appe
- Page 413 and 414: SDE-VS User’s Guide (Part 1) Appe
- Page 415 and 416: SDE-VS User’s Guide (Part 1) Appe
- Page 417 and 418: SDE-VS User’s Guide (Part 1) Appe
- Page 419 and 420: SDE-VS User’s Guide (Part 1) Appe
- Page 421 and 422: SDE-VS User’s Guide (Part 1) Appe
- Page 423 and 424: SDE-VS User’s Guide (Part 1) Appe
SDE-VS User’s Guide (Part 1) Chapter 14 – Team Collaboration with CVS Repository<br />
Resolving Conflict<br />
Sometimes, you may modify the same model as your teammate with different changes. In this case, the server will not know<br />
which revision should be preserved and it will show a conflict.<br />
Conflicts may happen when you commit the project.<br />
14-12<br />
Figure 14.26 - Conflict found in merging<br />
Conflict may also happen when you update your project.<br />
Figure 14.27 - Conflict found in updating