Resolve conflict markers in blackvariancecurve.cpp copyright header#21
Open
mattmenefee wants to merge 1 commit into
Open
Conversation
Commit 4f35d3e ("QPR-14001 merge ql 1.42.1 (Work in progress)") left unresolved Git conflict markers in the copyright header of ql/termstructures/volatility/equityfx/blackvariancecurve.cpp. The follow-up commit d500a5f ("QPR-14001 bugfixes after QL upgrade to 1.42.1") did not clean them up. The markers fall inside the /* */ copyright block so the file compiles, but they remain on master tip and trip code-review tooling that greps for unresolved merge markers. Resolution: keep both copyright lines (AcadiaSoft and Paolo D'Elia) and drop the marker lines. No code change.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
4f35d3eab(QPR-14001 merge ql 1.42.1 (Work in progress)) left unresolved Git conflict markers in the copyright header ofql/termstructures/volatility/equityfx/blackvariancecurve.cpp(lines 6–10).d500a5fdc(QPR-14001 bugfixes after QL upgrade to 1.42.1) did not clean them up, and the markers remain onmastertip./* */copyright block so the file still compiles, but they trip pre-merge tooling that greps for<<<<<<< HEAD/>>>>>>>markers.This PR keeps both copyright lines (
AcadiaSoft, Inc.andPaolo D'Elia) and removes only the three marker lines. No executable code is changed.Before
```
Copyright (C) 2002, 2003, 2004 Ferdinando Ametrano
Copyright (C) 2003 StatPro Italia srl
<<<<<<< HEAD
Copyright (C) 2025 AcadiaSoft, Inc.
Copyright (C) 2026 Paolo D'Elia
After
```
Copyright (C) 2002, 2003, 2004 Ferdinando Ametrano
Copyright (C) 2003 StatPro Italia srl
Copyright (C) 2025 AcadiaSoft, Inc.
Copyright (C) 2026 Paolo D'Elia
```
Test plan
<<<<<<< HEAD/>>>>>>>markers (verified viagit grep)The pre-existing commented-out markers in
test-suite/defaultprobabilitycurves.cppare intentional documentation of the v1.35 → HEAD API change (prefixed with//and surrounded by/* */to preserve the v1.35 alternative as a reference) and are not addressed by this PR.