Fork is my current fav too when I want to use a GUI. I used to be a big fan of GitKraken, particularly for it's beautiful interface and merge tool. However, once they started charging to use it with a non-GitHub repo, I knew it was time to find an alternative. After trying 5 or 6, Fork was the clear winner.
The only thing I miss from GitKraken is the built-in conflict resolution tool. I use P4Merge now, and am happy with it. While it is more powerful, it does lacks the simplicity and nice design of GitKraken's. With any luck, I'll figure out how to unlock Fork's!
However, I saw that your screenshot shows an internal merge tool! I swear I've clicked the Merge button (which no longer says 'beta') before and was just given the default textual git merge with the comments. After seeing this post, I just tried it again, and I'll be damned if it didn't provide a nice merge tool! I'm thrilled. Thank you so much!
Can’t agree more. Yeah the built in merge tool is new it’s not as nice as GitKrakens. Since I do a lot of web development I use Visual Studio Code for the merge conflict resolver. I found that to work the best for me.
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
Fork is my current fav too when I want to use a GUI. I used to be a big fan of GitKraken, particularly for it's beautiful interface and merge tool. However, once they started charging to use it with a non-GitHub repo, I knew it was time to find an alternative. After trying 5 or 6, Fork was the clear winner.
The only thing I miss from GitKraken is the built-in conflict resolution tool. I use P4Merge now, and am happy with it. While it is more powerful, it does lacks the simplicity and nice design of GitKraken's. With any luck, I'll figure out how to unlock Fork's!
However, I saw that your screenshot shows an internal merge tool! I swear I've clicked the Merge button (which no longer says 'beta') before and was just given the default textual git merge with the comments. After seeing this post, I just tried it again, and I'll be damned if it didn't provide a nice merge tool! I'm thrilled. Thank you so much!
Can’t agree more. Yeah the built in merge tool is new it’s not as nice as GitKrakens. Since I do a lot of web development I use Visual Studio Code for the merge conflict resolver. I found that to work the best for me.