ARTESCA-13337 - fix error edit lock setting

[MonPote]

No description provided.

[bert-e]

Hello monpote,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options

name	description	privileged	authored
/after_pull_request	Wait for the given pull request id to be merged before continuing with the current one.
/bypass_author_approval	Bypass the pull request author's approval	⭐
/bypass_build_status	Bypass the build and test status	⭐
/bypass_commit_size	Bypass the check on the size of the changeset TBA	⭐
/bypass_incompatible_branch	Bypass the check on the source branch prefix	⭐
/bypass_jira_check	Bypass the Jira issue check	⭐
/bypass_peer_approval	Bypass the pull request peers' approval	⭐
/bypass_leader_approval	Bypass the pull request leaders' approval	⭐
/approve	Instruct Bert-E that the author has approved the pull request.		✍️
/create_pull_requests	Allow the creation of integration pull requests.
/create_integration_branches	Allow the creation of integration branches.
/no_octopus	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
/unanimity	Change review acceptance criteria from one reviewer at least to all reviewers
/wait	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
/help	Print Bert-E's manual in the pull request.
/status	Print Bert-E's current status in the pull request TBA
/clear	Remove all comments from Bert-E from the history TBA
/retry	Re-start a fresh build TBA
/build	Re-start a fresh build TBA
/force_reset	Delete integration branches & pull requests, and restart merge process from the beginning.
/reset	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

[bert-e]

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

[MonPote]

/approve

[bert-e]

Conflict

A conflict has been raised during the creation of
integration branch w/3.0/bugfix/ARTESCA-13337-fix-error-edit-lock-setting with contents from bugfix/ARTESCA-13337-fix-error-edit-lock-setting
and development/3.0.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/3.0/bugfix/ARTESCA-13337-fix-error-edit-lock-setting origin/development/3.0
 $ git merge origin/bugfix/ARTESCA-13337-fix-error-edit-lock-setting
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/3.0/bugfix/ARTESCA-13337-fix-error-edit-lock-setting

The following options are set: approve

[MonPote]

/create_integration_branches

[bert-e]

I have successfully merged the changeset of this pull request
into targetted development branches:

• ✔️ development/2.2

• ✔️ development/3.0

The following branches have NOT changed:

• development/1.4
• development/1.5
• development/1.6
• development/2.0
• development/2.1

Please check the status of the associated issue ARTESCA-13337.

Goodbye monpote.

The following options are set: approve, create_integration_branches