[Platform Initiative] Improve nbgitpuller conflict resolution algorithm

[Gman0909]

Context

SOW

What we need to do

Deliver on the SOW to improve nbgitpuller conflict resolution algorithm

Definition of Done

• The feature/service is technically complete
• The feature/service been tested with one or more users (if applicable)
• The feature/service been deployed to a production cluster
• The feature/service has been shown to be replicably deployable
• The feature/service follows our definition of minimally documented
• The feature/service has been added to our product menu (if applicable).
• Lessons learned have been documented
• The feature's availability has been communicated to Sales
• The feature has been communicated to our communities