ReviewPR-214

Two developers, one measure

You and Sam changed the same measure in the shared semantic model on different branches. Git can't merge it. Resolve it without losing either change.

Reported by: Sam Patel, BI Developer (your teammate)
Opened: Tue 26 May 2026, 14:40
Needed by: Release train Thu 28 May
Priority: Medium
Time box: 3 h

Labels: pull-requestmerge-conflict

Previously at Northwind

The shared model from Sprint 05 now lives in Git as a PBIP project. Every change goes through a pull request reviewed by someone else before Elena deploys it.

Why the business cares A careless merge silently drops someone's change, or renames a measure that twenty visuals still reference, and nobody notices until a report shows blanks in production. Merging well is what makes team development safe.

Brief

Sam PatelBI Developer (your teammate)chat Tue 26 May, 14:40

Hey, my branch renames Net Sales to Net Revenue (Finance asked for the wording after the consolidation) and adds Net Revenue %. Yours excludes Staff and adds Net Sales LY, right? Git says conflict in _Measures.tmdl. Can you sort it out? I'm in workshops all afternoon. Just take mine if in doubt 😅

Elena TorresBI Lead (your manager)pr Tue 26 May, 15:05

Review checklist for the release train

Both changes kept unless one is wrong.
No broken references in measures or in report visuals.
BPA: no new errors (severity 3); warnings explained.
PR description: what changed, why, how it was tested, risk, rollback.

Nina KowalskiFinance Analystemail Tue 26 May, 15:20

Net Revenue name

Just so you know: in the KPI dictionary "Net Revenue (ledger)" is the Finance measure. I asked Sam to rename the order-based one, but I didn't mean to call it plain "Net Revenue"! Can we make sure the names don't clash?

What you are expected to do

Work out what each branch changed relative to the common ancestor (a three-way comparison, not two files side by side).
Resolve the conflict so both intentions survive, and so no measure or visual references a name that no longer exists.
Validate: the file must open in Power BI Desktop (or parse in Tabular Editor), every measure must evaluate, and BPA must show no new errors.
Commit with a meaningful message and write the pull request description, including risk and rollback.

Deliverables

Resolved _Measures.tmdl
List of every reference you had to update (measures and report visuals)
BPA result after the merge, with each remaining warning explained
Pull request description

Evidence

git_log.txt Branch graph, the failed merge, and where the report uses the measure.
base/_Measures.tmdl (common ancestor)
ours/_Measures.tmdl (your branch)
theirs/_Measures.tmdl (Sam's branch)
conflicted/_Measures.tmdl (what Git left you)
bpa_results.json (on your branch, before merging)