$$Create two separate branches from master $$Make changes in the same function of the source code in both the branches $$Merge branch$1$ into the master$$Try and merge branch$2$ into themaster$($merge conflict should arise$)$Install a merge tool of your choice and resolve the merge conflict usinggit mergetool command