Git Manager merge not working

Thanks for reporting an issue! Spend 60 seconds reading this…

  1. Before reporting, make sure you have the latest version of Wappler.
  2. Make sure you have searched the forum first for similar issues being reported
  3. If it is a general web related issue - do a Google Search first
  4. Issue tracker is only for bugs and feature requests, in English only.
  5. Learn how to report bugs effectively

======== TEMPLATE BUG FORM ========

Wappler Version : 3.7.4
Operating System : Windows 10 Pro
Server Model: Node
Database Type: MySQL
Hosting Type: Docker

Expected behavior

What do you think should happen?

Changes made in a Git branch should be merged into the master after merge branch to master is carried out in Git Manager

Actual behavior

What actually happens?

API action added in a branch does not appear in the master after the merge

How to reproduce

  • Detail a step by step guide to reproduce the issue
  • A screenshot or short video indicating the problem
  • A copy of your code would help. Include: JS, HTML.
  • Test your steps on a clean page to see if you still have an issue

Start with no actions

Add a first action

Commit the first action in the master
image

Create a branch
image

Switch back to master
image

Add API in the master

Commit change to master
image

Switch to branch
image

Add API in the branch

Commit change to branch
image

Confirm ‘Set Value master_action’ not present in branch_test (as expected)

Switch to master
image

Confirm ‘Set Value branch_action’ not present in master (as expected)
image

Merge branch_test back to master
image

image

Post merge shows that ‘Set Value branch_action’ is not present in merged system

Just to see what happens, a new action is added to the merged master.

Git Manager shows two changes to commit, including to git_test_branch.json which is where the branch changes were made but has not been modified since the merge
image
image

After commit ‘Set Value branch_action’ still not present in merged system

Community Page
Last updated: