Resolving Conflict

 Resolving Conflict:

Suppose two directors wants to change the name of the Dragons in the file name Dragons in the Croatia folder if you have noticed in all the above examples the name of the folder Croatia is written incorrectly and you know exactly what to    doJ.

 So in the Dragons file two directors posted the name of the dragons from two different locations. One director from the Scene location and another director during the discussion with the author. So you can clearly see the problem that is going to happen in the next minute when they commit the file to the repository. The one who commits the file first doesn’t experience much pressure because the second one will feel the heat J incase if both the directors changes same line that will lead to the conflict.

If incase they change the different lines then the second one can rectify the conflict by updating the repository.

In order to make this comfortable I have changed the Working copy to the name of the directors to avoid confusion.

Case 1:

Director Benioff changed the name of the dragons to

Viserys
Drogon
Rhager

Now Director Weiss is going to update his changes.

Now if you try to update Director Weiss you will be getting changes from Director Benioff as well.

Finally you will end up like this so it is your duty to make sure you contact the person in the other end to resolve the problem.  Because when you look Director Benioff  he is completely safe without any damage that’s because he is the one who committed his changes first. So SVN knows the changes made by Benioff whereas SVN thinks Weiss is trying to make some damages.

Use the command:  svn resolved Dragons.txt to intimate Benioff that his changes is also necessarily important than yours.

Now if Benioff update his working copy from another location. You can see the Dragons file from Benioff is also changed.

Now the duty of both the directors is to consult among themselves and they need to come to one conclusion, r27 is revision number. If you check the log for that particular revision you can find the user who made the change including the date as well as time and also the type of changes he made.