My coworker is extremely careless a is always over-writing my changes in Git. So we'll have a develop branch. I'll merge branch1 into develop, and my coworker will merge branch2 in that overwrites my changes.
Is there a way can merge branch1 back in so I can reassert my changes and resolve the conflicts?