Hey there! Our first suggestion would be to rebase, since lots of merges in both directions can create a very tangled graph that's hard to read. You can read on the best way to do that here: www.gitkraken.com/learn/git/git-rebase
When you have merge conflicts in SourceTree, the commit message will automatically list the conflicting files. This is really important for us to be able to find difficult merges another developer should double check. Can GitKraken be setup to do this too?
How can I get updates from the develop branch (Merge develop into feature)?
Hey there! Our first suggestion would be to rebase, since lots of merges in both directions can create a very tangled graph that's hard to read. You can read on the best way to do that here: www.gitkraken.com/learn/git/git-rebase
When you have merge conflicts in SourceTree, the commit message will automatically list the conflicting files. This is really important for us to be able to find difficult merges another developer should double check. Can GitKraken be setup to do this too?
Hey there! This is indeed a feature but you can give it an upvote from here: feedback.gitkraken.com/suggestions/335139/add-git-conflict-message
ty