📒
Gitoqlok
Gitoqlok
  • 🐱‍👓 Welcome
  • 🟢Changelog
  • ❔FAQ
  • ⚒️Functionality Overview
  • 🐞How to report a bug?
  • 💳License Management
    • Master License key
    • Single License Key
  • Main
    • Git for newbies
    • Collaborative Development with Gitoqlok
    • Gitoqlok Development Set of Rules: Git + Qlik Sense
    • Best Practices to Configure Git Environment
    • How Gitoqlok Bypasses the Git API rate limit
    • How Fast do Git Providers Process Large App Versioning
  • 🏃‍♀️Kick-start
    • Connect Qlik Sense to Git
      • Connect Qlik Sense to GitHub
      • Connect Qlik Sense to GitLab
      • Connect Qlik Sense to Bitbucket
      • Connect Qlik Sense to Azure DevOps
    • Applications Manager: Bulk repository creation
      • From Options Page
      • From Qlik Sense hub
    • Git Settings for repositories
      • Repository grouping
    • Creating Git repository and commits in Qlik Sense
      • Committing Bookmarks to the Git Repository
      • Committing Static Files to the Git Repository
      • Standalone Qlik SaaS Script versioning
      • Committing Qlik Automation to the Git Repository
    • Revert to the previous version of the Qlik Sense application
    • How to Publish an Application?
  • 👩‍💻Tutorials
    • Importing Qlik Apps and App Objects from Git
      • Import
      • Deploy from Git
      • Import Qlik app from existing repository
    • Gitoqlok Helper
      • Time Machine
      • Diff Viewer
      • Set a Thumbnail
      • Sheets Comparator
      • Diff Editor (Merge)
      • Load Script Versioning
      • Highlighted Master Items
      • Tags Manager
      • QVD Links: Data Load Editor
    • Application Checklist
      • Publish checklist to everyone
      • Share checklist privately
    • Environment Migration
      • Export
        • Existing repository
        • Create Repository
        • Download file
      • Import
    • Migration of Bookmarks between Qlik Servers
    • Task Chain
    • Security Rules Manager
    • Dark Theme
    • Collision Detection
    • Business Glossary
    • Usage Management
  • 🤝Third-party Integrations
    • ✨OpenAI
      • AskAI: Sheets and Mesaures
      • AskAI: Documentation Wizard
    • QSDA Pro Integration
      • QSDA Pro Charts Deconstruction
    • Soterre Integration
      • QVD Lineage
      • Global Search
  • Gitoqlok for Power BI
    • Application Checklist
Powered by GitBook
On this page

Was this helpful?

  1. Tutorials
  2. Gitoqlok Helper

Diff Editor (Merge)

This section describes how to merge changes via Diff Viewer.

PreviousSheets ComparatorNextLoad Script Versioning

Last updated 1 year ago

Was this helpful?

Sheets Comparator allows viewing changes between different branches of the sheet visualization using the Diff Viewer tool.

There is an added ability to merge changes in a Diff Viewer.

You may visit the .

Sheets Comparator showcases the sheets highlighted green - if the sheet is new; yellow - if the sheet has changes.

Click on the sheet that has changes - in Gitoqlok Helper pop-up proceed to the Diff Viewer.

Notice the right hindsight on the timeline at the top: you should be able to see the “Branch” toggle list. Choose the branch you want to compare your current visualization with.

The timeline is now transformed into showing you saved application sheet versions of User B. Switch between the versions and see the changes highlighted.

When there is a changed object on the sheet, the “Merge Changes” button is activated by clicking on the object.

Merge could be applied using the Table difference mode:

You could check the corresponding boxes to make particular changes on your sheet.

Or done manually in the JSON split editor:

JSON split editor highlights the lines of the script representing the changes made on the current sheet. The panel on the left showcases the script before the change, while the one on the right represents the changes. In this example, it can be seen that not only the "qAggrFunc" has changed from "Count" to "Expr", but also the ColumnSortOrder has been reordered, and no exclusions are now made in "qLayoutExclude".

Notice the "Revert chunk" tooltip between the two panels of JSON Split Editor. Revert chunk enables replacements on the current application's chart-level scripting. Once clicked, changes are applied on the left side of the panel.

After clicking on Apply Merge, the left-sided version should have the "*changed" label.

Changes are successfully applied: both panels have the same "Sales Rep by Variance" table version.

Overall sheet changes could be applied by clicking on the "Apply Commit" button. "Cancel", on the other hand, does not yield any modifications on the current application sheet.

👩‍💻
Sheet Comparator page
Gitoqlok Helper: Sheets Comparator
Select Branch
Diff Viewer panel view shows changes: changed object on the sheet is highlighted yellow
Clicking on the object activates the Merge Changes option
Table difference mode
JSON split editor
Revert Chunk overwrites the current application chart-level scripting
Both panels have the same "Sales Rep by Variance" table version
Apply Commit/ Cancel