...
| App Version | Description |
|---|---|
| 1 | Modify request form. |
| 2 | Add calendar menu to the app. |
Figure 1: Completed work on app version 1 and
Figure 2: Completed work on app version 2
When all features are developed and tested in v1 and v2, we are now ready to merge them. To preserve the work already done, we will clone v2 into a new copy, v3. Then we will attempt to perform the merging in v3 itself.
As shown in figure 2 below, bring up the "App Configuration Management" screen, select version 2, and click on "New Version".
Figure 2Figure 3: Clone app version 2 into 3
Once the version is created, navigate to the newly created version ( i.e. wflow/app_arc/meeting/meeting_3 ) from your command line. We are going to merge v1 and v3 through GIT commands below.
Figure 34: Merge app version 1 and 3 using GIT
...
Once we have merged them, if there are any conflicts, we will need to resolve them. In the figure shown below, we can see that there are 4 conflicted files.
Figure 45: Resolving Conflicts
In this case, we are making use of Visual Studio Code to inspecting the conflicted files and resolve them.
Figure 56: Resolving Conflicts using Visual Studio Code
...
Once all conflicts are resolved, we can then commit merge.
Figure 67: Commit Merge
Going back to the Joget screen, navigate to "App Configuration Management" > "Git Configuration", turn on "Auto Sync DB from GIT" as shown in the figure below.
Figure 78: Turn on Auto Sync DB from GIT
...
We can check the server log for sync completion. Once it is done, we can then inspect the app again to make sure that everything in v1 and v2 is merged properly in v3.
Figure 89: Verify changes from version 1 and 2 in-app version 3.
...