resolving conflicts

426 views

Skip to first unread message

J S

unread,

Jan 31, 2020, 1:56:59 PM1/31/20

to tortoisegit-users

Hello,

When merging changes from our central origin repository, I get choices of 'Resolve conflict using "changes-to-be-integrated"' and 'Resolve conflict using "HEAD"'. I'm not hard-core enough to know which is which so I just revert changes and mark resolved.

I suppose "mine" and "theirs" are not sufficiently git enough, but is there any way to indicate which is which?