Hello,

I'm a junior dev with 2 years of professional experience and a SmartGit subscription.

While working on merge conflicts, I've noticed time after time that it would be immensely valuable to have a record of how each conflict was solved if just for some peace of mind and avoid finger pointing when a bug appears. The problem is that when a merge commit is created after resolving conflicts, Git doesn't keep track of several key pieces of info:

1- How many conflicts were there initially?
2- Which files were affected?
3- Which specific lines of a given file were in conflict?

4- How were the different conflicts solved?

Now, what's great about SmartGit is that when creating a merge commit a comment addressing point 2 is already being included. This is great! But I think we can do much better.

I have 3 propositions:

1- Generate a "Conflict Resolution Report: Upon creating the merge commit, it would be fantastic if SmartGit could export a detailed report for each conflicted file. A simple screenshot for each conflict could be a start/additional option.  A more useful text-based format like a .diff patch or an interactive HTML file, clearly highlighting what the conflict was and how it was solved would be even better since you never know what the user has on the screen during a screen capture. This would create an invaluable artifact for code reviews and future debugging. Even more powerful the ability to attach a comment to each change so that future me and other devs can quickly understand the reasoning behing complex decisions.

2- Record Resolution button: As an additional or alternative option, a "Record Resolution" button could be provided to trigger a video capture of the entire conflict resolution process, from the moment the user enters the Conflict Solver to the final save. This creates a high-fidelity audit trail and a last-resort backup of the decisions made. Even more, the trigger could set to be automatic. Every time I enter conflict resolver Smartgit would automatically trigger the recording. This way I don't always have to remember clicking the btn.

3- Built-in Conflict Recreation: Provide a way to "re-experience" a past merge conflict from the log. If a problem arises, I could select a merge commit, and SmartGit could instantly recreate the original conflict state in the Conflict Solver.

You could be the ones to implement all this, an entire system to audit each merge conflict.

The only thing that i find often inconvenient in SmartGit - the way conflicts are displayed and handled in Conflict Resolver.

SmartGit view:

JetBrains GitClient view:

The later has much more clear (and less scaring :) LOL)  picture of the conflicts.

Would be perfect if we are able to switch to yet another view on the conflicts that would be similar to the one on the second screenshot!

Thank you!

On left-click in Graph window, the current commit is selected.

If user clicks on branch label, in addition, it would be great to select also this branch in Branches window.

I have around 25 Submodules in a big Project. 
If possible do the git calls to Submodules in parallel.

The Submodules have nearly never Changes but come from different Locations and it seems most of the runtime is lost in the Time for Authentification.

git.exe -c credential.helper= -c "credential.helper=C:/Program\ Files/SmartGit/bin/smartgitc.exe --credential=somenumber" -c credential.useHttpPath=true fetch --progress --prune --recurse-submodules=no origin

Hi,

I have a feature proposal. Sometimes I do the following:

- type a filename in the "Files" tab and CTRL+L for seeing its history

- sometimes I search within the history

- I find the commit I'm interested in

- however now a really awkward set of actions is needed:

1. Copy the commit ID

2. Close the log window

3. Open the log window

4. Paste the commit ID to see surrounding commits and context

It would be great if there was a way to "step out" of the "local" (file based) log window and do a "reveal commit" globally, without closing and opening a new log window.

It would be desirable if the path to existing repositories could be adjusted in SmartGit.

Currently, this can only be done by removing and re-adding the respective repository or by manually editing the configuration files.

In my case, it was a necessary adjustment to the existing project structure that made this step necessary.

A helpful feature would be the ability to mark certain commits with a color, making them easier to find and revisit later.

When traversing changes either in working tree or stage, SmartGit resets "Ignore Whitespace" toggle after switch to next file back to default state which is untoggled.

This is to emphasise not missing unexpected or other kind of important w/s changes.

However from time to time one would need to traverse files quickly, to skim through changes at glance which is often not possible when w/s are highlighted.

I'm unsure how to approach the solution. E.g.: low lever setting for reset behavior, put it to hamburger menu of diff window, diff setting, double click on toggle would make it permanent, …

Set an option to only show merge requests if user is Reviewer or Assigned to it.