CODEWITHSUNDEEP
gitmergerebasesmartgitgit-merge-conflict
TheLemur
TheLemur

Reputation: 99

What does the SmartGit conflict resolver actually mean?

Here is an expample of the dialoge box i am talking about

So yeah, I am starting to get the hang of git and have been using SmartGit as the client. So far I am still learning a lot of the git language, but I know enough to understand the difference between merge and rebase for example.

Right now I'm in the middle of rebasing my branch on top of develop, but a conflict happens.

Knowing just enough means I find the text here to be a bit ambiguous, and I don't feel confident that I could solve the mess if I went ahead and experimented, so that is why I am asking for help.

I want too have their file replace the version that I have in my branch, I want to complexly discard any changes made be me on that specific file. What do I select??

Thanks in advance ;) PS: I have done some research on the topic, and there is a lot of great answers using the command line to resolve this kind of situation. I am not looking for those solutions (Unless, of course, that is the ONLY way to achieve what i want).

Upvotes: 0

Views: 1039

Answers (1)

rakhee
rakhee

Reputation: 109

If you are using Smartgit, once you see the conflict, right click and open conflict-solver. If you want to overwrite changes with yours, choose ours and save. Then choose commit and it will ask for rebase and commit.

Conflict-solver shows diffs with colors and is easy to use.

Upvotes: 4

Related Questions