When pulling it should be possible to directly open the modifications window for editing conflicts
By Adriaa... on February 17, 2011 11:13 (imported from Google Code)
What steps will reproduce the problem?
- Make a situation where a pull will cause conflicts
- Do the pull -> the log shows that there are conflicts
- Now i need to browse through my files or click tortoisegit/check-for-modifications for solving the conflicts
Can the pull dialog show an extra button 'check for modifications' when there is a conflict after pulling? This will make the process of fixing conflicts more easy (and even more conform how toirtoiseSVN users do it, namely rightclick on each red line in the update-log)
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information