Coderwall
Ruby
Python
JavaScript
Front-End
Tools
iOS
More
Tips
Ruby
Python
JavaScript
Front-End
Tools
iOS
PHP
Android
.NET
Java
Jobs
Jobs
Sign In or Up
Joined December 2014
·
tommyjiang
Tommy
Beijing
·
·
0 Protips
1 Comments
Posted to
Use magit-ediff to resolve merge conflicts
over 1 year ago
Thanks for sharing. I really love it.
Achievements
1 Karma
0 Total ProTip Views
Thanks for sharing. I really love it.