4 ms·

Is sublime doing the merge instead of git? Or are you referring to use sublime as the merge tool to resolve conflicts?

• joombaga 5y ago
  Sublime Merge is a GUI git/mergetool, from the makers of Sublime Text.
• pkulak 5y ago
  Just for resolving conflicts.