Need help with GIT logic
So I need some help with git functionality
my workflow: im working using a feature branching workflow with multiple people
the general structure goes something like this (branches): Dev (anything that is still in development) -> beta (optional) -> Release
The way we work is by creating branches that describe our features on top of Dev, once we are done we merge
my problem: how can i ensure/update my feature branch from the latest dev branch without losing my code, if the same file was edited for example
and more specifically does git just overwrite the entire file or will it leave my functions etc. alone
my workflow: im working using a feature branching workflow with multiple people
the general structure goes something like this (branches): Dev (anything that is still in development) -> beta (optional) -> Release
The way we work is by creating branches that describe our features on top of Dev, once we are done we merge
my problem: how can i ensure/update my feature branch from the latest dev branch without losing my code, if the same file was edited for example
and more specifically does git just overwrite the entire file or will it leave my functions etc. alone
