Explain your workflow for resolving a complex merge conflict in Git involving multiple active development branches.
