Update xml2objectwidget.cpp #15

Open

hpgood wants to merge 1 commit from hpgood/patch-4 into main

hpgood commented

2020-11-13 05:04:13 +00:00

(Migrated from github.com)

change to getXMLHighlightConfPath() method,which is public method.

This pull request has changes conflicting with the target branch.

xml2object/src/xml2objectwidget.cpp

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Update xml2objectwidget.cpp' (#15) from hpgood/patch-4 into main

Merge commit body

Reviewed-on: https://git.nullptrlabs.io/pgmodeler/plugins/pulls/15

Merge pull request 'Update xml2objectwidget.cpp' (#15) from hpgood/patch-4 into main

Reviewed-on: https://git.nullptrlabs.io/pgmodeler/plugins/pulls/15

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin hpgood/patch-4:hpgood/patch-4

git switch hpgood/patch-4

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff hpgood/patch-4

git switch hpgood/patch-4

git rebase main

git switch main

git merge --ff-only hpgood/patch-4

git switch hpgood/patch-4

git rebase main

git switch main

git merge --no-ff hpgood/patch-4

git switch main

git merge --squash hpgood/patch-4