Our team just started using git recently. despite having a ton of training material, we\'re still somewhet confused on how to merge properly with the branching strategy our comp
