Svn Summary (II)-conflicts and svn summary conflicts

Svn Summary (II)-conflicts and svn summary conflicts


SVN Summary (II)-conflict


Burst:

A conflict leads to a stop or interruption, and reminds you of the interrupt handling and movement of the operating system. Interrupt Processing

It is because of a "Conflict", because something occurs, the current operation is suspended, and the operating system is used to handle the event.

Process where the process is terminated and continues to run as appropriate. Move: You need to change the storage location of a stored job from

Moving a storage area to another storage area is called moving. This is a solution for better work.

Methods and cases.

I. Basic concepts of conflict:

 

1. Conflict: what?

2. Conflict: why?

3. how? How can this problem be solved?

Change the conflict:

The red below indicates the conflicting part. The left and right parts are different. The following is the public part.

Remove conflicts:

After a conflict is reached, remove the conflict and right-click the file -- TortoiseSVN -- Revert.

Library merge: drag the file directly to file 2.

2. Comparison:

Similarities:

Conflict, interrupt processing, and mobile operations are all handled by the process of suspension, which must be stopped for processing,

After the improvement, re-execute the process.

Differences:
1. Conflict & interrupt handling

Interrupt handling; because something occurs, stop the current operation, use the operating system to handle the event, to be appropriate

The process where the process is terminated and continues to run.

2. Conflict & mobile
(1) Mobile:
You need to change the storage location of a stored job from one storage zone to another.


The purpose of moving to technology: 1. Focus on scattered idle areas. 2. facilitate the dynamic expansion of primary storage for members.


(2) Disadvantages of mobility:
1) The system overhead is increased, and the OS occupies the CPU time required for system resources and is moved to the job change process.
2) Moving is conditional (running jobs cannot be moved)


Therefore: using two-end load jobs can reduce the number of jobs to be moved and the amount of information.

 Summary:

Conflict, movement, and interruption handling are different for three years, but there are many similarities between them.

By summing up and studying the comparison, we can build a knowledge network to better understand ourselves. They all need to be aborted,

Then, process the data, reprocess the data, improve the data, and then reply to the process. Although the solution may be different

Or the same, all to improve efficiency and speed up the process.