Skip to content

Epic: Merge Conflict Resolution Training & Documentation #8

@manojkumar-jmp

Description

@manojkumar-jmp

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

Labels

EpicA large feature broken into smaller tasks/issues for planning and tracking progress.

Projects

Status

Todo

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions