Versions Compared

Old Version 4

changes.mady.by.user Ismat

Saved on

compared with

New Version 5

changes.mady.by.user Andrew

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

  1. Shutdown Joget server so that it does not lock on to the GIT folder.
  2. Use your favorite GIT interface, find out at which commit changes are made to remove the content in the 2 files mentioned above. For example, we found out that it happened in commit e87ec85.

  3. Make use of GIT, and perform a GIT reset.

    Code Block
    C:\Joget-DX8-Enterprise\wflow\app_src\supportTicket\supportTicket_3>git reset e87ec85
Unstaged changes after reset:
M	appConfig.xml
M	appDefinition.xml
C:\Joget-DX8-Enterprise\wflow\app_src\supportTicket\supportTicket_3>git status
On branch supportTicket_3
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   appConfig.xml
	modified:   appDefinition.xml

    If you are using Github Desktop, you can right-click on e87ec85 and choose "Revert Changes in Commit".

  4. Verify the changes, resolve the conflicts if necessary, and commit the unstaged files. If you are using Github Desktop, you can inspect them in "Changes" tab, resolve the conflicts if necessary, and commit the unstaged files.

  5. Start Joget server, go to the app, and trigger a sync from GIT to Joget.

Related Links