Magic Wand
Use the magic wand to resolve simple conflicts in your code.
Do you have merge conflicts? Don't worry! Use the magic wand to resolve simple conflicts. With those out of the way, you can focus on resolving the rest.
Do you have merge conflicts? Don't worry! Use the magic wand to resolve simple conflicts. With those out of the way, you can focus on resolving the rest.
