Each week we share a #GitKrakenTip on Twitter to help you become a more productive Git user. If you’re just getting started with our Git client—on Windows, Mac or Linux—I recommend starting with this 2-minute overview video of GitKraken.
I’m pretty new to git, so there’s a lot to learn. @GitKraken is THE git client. It’s so clean and easy to use!
— Rodrigo Aranguren (@arangurr) March 25, 2016
If you’re already using GitKraken, hopefully you’ll learn something new from our latest tips:
GitKraken Tips
1. Have a merge conflict? Click the file in the right panel and resolve it with our merge tool.
![](https://www.gitkraken.com/wp-content/uploads/2021/06/Tip10-gk-conflict-1-1024x553.gif)
2. When merging, choose to either create a merge commit or fast-forward your branch.
![](https://www.gitkraken.com/wp-content/uploads/2021/06/Tip11-gk-merge-no-ff.gif)
3. Easily preview and discard hunks or even specific lines of code before staging file changes.
![](https://www.gitkraken.com/wp-content/uploads/2021/06/Tip12-gk-tip-discard-line-hunk.gif)
4. Resize the commit graph to optimize space for repos with many branches, even down to a single column.
![](https://www.gitkraken.com/wp-content/uploads/2021/06/Tip13-gk-graph-resize.gif)
5. Toggle tree view to see file changes by folder, view change summaries quickly & stage entire folders.
![](https://www.gitkraken.com/wp-content/uploads/2021/06/Tip14-gk-tree-view.gif)
6. View a file’s history to see diffs for each commit, and toggle blame to see who made changes where.
![](https://www.gitkraken.com/wp-content/uploads/2021/06/Tip14-gk-history-blame-1024x565.gif)