Any customisations that may be required must be performed manually. With this you can fall back to the old version of your file, and go without Checkmk’s update for this file. Apart from this the file remains as customised by the user. The successfully inserted changes are retained. Here you can decide whether to accept the data ‘as is’. Once the editor has been closed Checkmk will reattempt the merge. Now edit the file in order to bypass possible conflicts. This third option in effect ‘closes the triangle’ by showing the changes which Checkmk intends making to the file.īy selecting t, your original file – without the already successfully-merged changes – will be opened in an editor. This is similar to the above, but based on the preceeding default version shows which changes you have made to the file. This shows the differences between the new default version and your version of the file in the form of a ‘unified diff’ ( diff -u). In the situation shown above, you now have the following options:
0 Comments
Leave a Reply. |