Settings and activity
2 results found
-
on the conflict resolution screen, easier way to page down through lots of conflicts and 'take mine'
7 votesAn error occurred while saving the comment 
Aaron Templeton
supported this idea
·
-
48 votes
An error occurred while saving the comment Aaron Templeton
commented
Please be aware, I consider this to be fallout from git not honoring commit hooks in general. Which is referenced by the following support request:
https://redgate.uservoice.com/forums/39019-sql-source-control/suggestions/33730249-sql-source-control-git-hook-supportIf the hooks were honored, you would create a simple git hook that required a comment. That requirement would then be honored by all systems (command line, Visual Studio, etc), not just SQL Source Control. At present, SQL Source Control is still using the gitlib2 library which does not honor hooks. The command line does honor hooks. Visual Studio converted away from gitlib2 as of VS 2017 and thus now honors the hooks.
Aaron Templeton
supported this idea
·
An error occurred while saving the comment Aaron Templeton
commented
This appears to be a failing of the libgit2 API which Redgate is using. It does not run any of the hooks, commit-msg in this case. Microsoft suffered the same failing with Visual Studio until they converted over to directly running the git.exe shell as of VS 2017. I would ask that you take a similar initiative. For now, we are catching the failings in a bare repository pre-receive hook which then forces the user to repair their local repository through either a "git commit --amend" or else an interactive rebase. This gets especially messy if they have already done any branch merging. Please see for reference: https://visualstudio.uservoice.com/forums/121579-visual-studio-ide/suggestions/4321705-enable-client-side-hooks-when-committing-code-to-a
Please note that this also applies to the "Take theirs" option. There are times where the bulk of differences are one or the other. If not entirely one sided. It would certainly improve usability to have a hotkey that can run through the process. Your user community will primarily be power users who know how to leverage keyboard based navigation. And it only takes one occasion to see what is a rather obvious interface oversight and become annoyed. This is too good a product to get slighted by what should be an easy interface fix. And after 9 years, you'd think this would have been addressed by now.