Giters

XgridInc / xc3

XC3 is a cloud agnostic and risk free package offering powered by Cloud Custodian that provides resource inventory, tagging compliance, unused or invalid resources cleanup, account maintenance, cost control, backups, monitoring and alerting.

Geek Repo:Geek Repo

Github PK Tool:Github PK Tool

Resolve PR conflicts from feature branch to main branch

yaseenzafar123 opened this issue · comments

commented

User stories

As a software developer, I want to resolve PR conflicts from a feature branch to the main branch, so that I can merge the feature branch into the main branch.

Acceptance Criteria

  • Identify the conflicting files and lines of code between the feature branch and the main branch.
  • Manually resolve the conflicts by modifying the conflicting files.
  • Ensure that the resolved code is reviewed, approved, and merged into the main branch.
  • Test the merged code to ensure it functions as expected.
  • Close the feature branch after successful merge.