Documentation fixes

This commit is contained in:
Juan Ferrer 2020-11-17 13:44:46 +01:00
parent a05c5ad3df
commit c2f83f63f8
2 changed files with 13 additions and 13 deletions

View File

@ -138,23 +138,23 @@ a small project.
## Todo ## Todo
Pending improvements. Improve the pull command to, instead of completely overwriting the routines
* Improve the pull command to, instead of completely overwriting the routines
directory, merge the database changes with the local SQL files. It is possible directory, merge the database changes with the local SQL files. It is possible
using a library that allows to manipulate git repositories (nodegit) and running using a library that allows to manipulate git repositories (nodegit) and running
the following steps: the following steps:
1. Save the current git HEAD 1. Save the current HEAD.
2. Check out to the last database push commit (saved versioning datatables) 2. Check out to the last database push commit (saved in versioning tables).
3. Create a new branch 3. Create and checkout to a new branch.
4. Export routines 4. Export database routines.
5. Commit the new changes 5. Commit the new changes.
6. Merge the new branch with the initial HEAD branch. 5. Checkout to the original HEAD.
6. Merge the new branch into.
7. Let the user deal with merge conflicts.
* Migrate all possible tools and code from shell scripts to native Javascript, Furthermore, migrate all possible tools and code from shell scripts to native
dealing with dependencies and compatibility issues between various OS that this Javascript, dealing with dependencies and compatibility issues between various
may cause. OS that this may cause.
## Built With ## Built With

View File

@ -1,6 +1,6 @@
{ {
"name": "myvc", "name": "myvc",
"version": "1.0.11", "version": "1.0.12",
"author": "Verdnatura Levante SL", "author": "Verdnatura Levante SL",
"description": "MySQL Version Control", "description": "MySQL Version Control",
"license": "GPL-3.0", "license": "GPL-3.0",