subl $(git diff --name-only --diff-filter=U)
This is even easier if you have a Git alias:
subl $(git unmerged)
In both cases it uses the Sublime text editor to open any file that has a Git merge conflict.
Subscribe to:
Post Comments (Atom)
iDealshare VideoGo is just the right AVI to Roku Converter which has both Mac and Windows version! It helps to convert various AVI files whatever encoded with DivX, Xvid, etc to Roku more supported MP4 or MKV. https://www.idealshare.net/video-converter/roku-avi.html
ReplyDelete