Auto resolve conflicts in smartgit while rebasing
conflict, git, rebase, smartgit
Solution
If smartgit is as smart as git then just go a head with
git rebase -s recursive -X theirs
Problem
There is this nice feature in smartgit that sets the conflicted file as the rebase target, which is by invoking the command 'Set to rebase target ("theirs")' on the file. However, I want this to be done automatically on every conflicted file during rebasing. There are just so many commits and conflicted files that resolving each file manually is very time consuming. Is there a way to make smartgit perform that resolution automatically ? Thanks.