In project 2024s2-tp-grupal-juego-grupo-1-uwu, our team has been focused on developing core combat mechanics, specifically the tank-based engagement systems. As development progresses, maintaining a clean and functional main branch while experimenting with specialized features like new combat roles requires a disciplined approach to version control.

The Challenge of Feature Branches

Introduction

In our ongoing work on the 2024s2-tp-grupal-juego-grupo-1-uwu project, we are currently focused on enhancing the combat mechanics for our game units. Specifically, we have been iterating on the 'ataque-tanque' (tank attack) feature to provide more robust gameplay interactions.

The Challenge

As development scales, managing parallel feature development becomes increasingly