-
Notifications
You must be signed in to change notification settings - Fork 0
Open
0 / 40 of 4 issues completedLabels
EpicA large feature broken into smaller tasks/issues for planning and tracking progress.A large feature broken into smaller tasks/issues for planning and tracking progress.
Description
Explain merge conflict resolution using Perforce Helix 3-Way Merge Interface.
Initial file contain is as follow
<Project ToolsVersion="15.0" DefaultTargets="Build">
<PropertyGroup>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="5.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
</ItemGroup>
</Project>
Sub-issues
Metadata
Metadata
Assignees
Labels
EpicA large feature broken into smaller tasks/issues for planning and tracking progress.A large feature broken into smaller tasks/issues for planning and tracking progress.
Projects
Status
Todo