Difference between revisions of "Version control"
Jump to navigation
Jump to search
→Errors
imported>Thingy Person (→Errors) |
imported>Thingy Person (→Errors) |
||
| Line 188: | Line 188: | ||
* You already did a merge in the same session. | * You already did a merge in the same session. | ||
* The CK automatically fixed an issue in your esm on load. One such issue is null records, which it will remove. If this happens, load the CK with just your master file, close it, and copy the changed esm from your Merging to your local data folder. Then load it anew. A telltale sign that this is happening is if you get a warning indicating that your master file differs in the local and network folders. | * The CK automatically fixed an issue in your esm on load. One such issue is null records, which it will remove. If this happens, load the CK with just your master file, close it, and copy the changed esm from your Merging to your local data folder. Then load it anew. A telltale sign that this is happening is if you get a warning indicating that your master file differs in the local and network folders. | ||
<source lang="html4strict">Checkout Warning: <Form> is a different version than it was when it was loaded. Check out prevented.</source> | |||
You need to regenerate the bit array (see above). You may have done a merge earlier and haven't regenerated the bit array since. | |||
==Notes== | ==Notes== | ||