nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

SourceTree and diffmerge on windows

bigdnf

I have strange behavior of SourceTree on windows. I have configured diff/merge to Diffmerge. On first computer it works but on second one Sourcetree is generating helper files (BACKUP, BASE, LOCAL, REMOTE) but diffmerge is not executed? Another thing is that on first machine after resolving all conflicts Sourcetree keep some of these helper files on disk (I have to delete it manually)

Accepted answers

stevestreeting

This is the standard git behaviour - I usually add *.orig to my global ignore list and just tidy these files up periodically.

All comments

bigdnf

I have reinstalled windows and now I have only one problem After successful merge of some file - for instance file.ext there is another file in solution file.ext.orig and current branch is in ‘Uncommitted changes’ – I have to delete this file manually to complete merge.

stevestreeting

This is the standard git behaviour - I usually add *.orig to my global ignore list and just tidy these files up periodically.

bigdnf

I'm new to this tool - tnx for a tip

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

merge

diff