Closed jonathan-gramain closed 4 months ago
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.
Status report is not available.
The Fix Version/s
in issue ARSN-425 contains:
7.10.63
7.70.32
Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:
7.10.63
7.70.32
8.1.132
Please check the Fix Version/s
of ARSN-425, or the target
branch of this pull request.
/create_integration_branches
A conflict has been raised during the creation of
integration branch w/7.70/bugfix/ARSN-425-listingLatestCrashWithUndefined
with contents from bugfix/ARSN-425-listingLatestCrashWithUndefined
and development/7.70
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/7.70/bugfix/ARSN-425-listingLatestCrashWithUndefined origin/development/7.70
$ git merge origin/bugfix/ARSN-425-listingLatestCrashWithUndefined
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/7.70/bugfix/ARSN-425-listingLatestCrashWithUndefined
The following options are set: create_integration_branches
A conflict has been raised during the creation of
integration branch w/8.1/bugfix/ARSN-425-listingLatestCrashWithUndefined
with contents from w/7.70/bugfix/ARSN-425-listingLatestCrashWithUndefined
and development/8.1
.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.1/bugfix/ARSN-425-listingLatestCrashWithUndefined origin/development/8.1
$ git merge origin/w/7.70/bugfix/ARSN-425-listingLatestCrashWithUndefined
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/bugfix/ARSN-425-listingLatestCrashWithUndefined
The following options are set: create_integration_branches
/approve
I have successfully merged the changeset of this pull request into targetted development branches:
:heavy_check_mark: development/7.10
:heavy_check_mark: development/7.70
:heavy_check_mark: development/8.1
The following branches have NOT changed:
development/6.4
development/7.4
Please check the status of the associated issue ARSN-425.
Goodbye jonathan-gramain.
The following options are set: approve, create_integration_branches
Fix a crash in DelimiterMaster listing without a delimiter, when a key contains the string "undefined".
Note: a similar fix was done in ARSN-330 for DelimiterVersions. I ported the existing unit test there to the development/7.10 branch to enhance regression testing, even though this bug on DelimiterVersions only existed on 7.70.