How to merge conflicts in Monticello?

Question

How do you merge in Monticello? Seriously.

When I have a conflict I have a changes-like window, and when I select a conflicting method, I can click on arrows/ticks/crosses in conflicts, but it does not decrease the number of conflicts and so the Merge button stays disabled. How do I merge?

I found that a bit confusing as well when I last came across it, +1. — Amos M. Carpenter, Oct 27 '15 at 01:29

score 3 · Accepted Answer · answered Oct 27 '15 at 07:33

3

you have to choose an integration option from the context menu right clicking in the conflict line. there are also shortcuts cmd+c, cmd+g

answered Oct 27 '15 at 07:33

EstebanLM

4,252
14
17

How to merge conflicts in Monticello?

1 Answers1