Open Terminal Git Bash the terminal.
Navigate into the local Git archive that has the consolidation conflict.
Produce a rundown of the records influenced by the consolidation conflict.
Open your preferred content tool, for example, Atom, and navigate to the record that has consolidate conflicts.
