JetBrains Resolving Git Merge Conflicts: The Easy Way JetBrains • Available on Youtube • Published 1 year ago