CODEWITHSUNDEEP
mergemercurial
shinigota
shinigota

Reputation: 53

Merge in local, base or other?

I have a project in which I've set up a bitbucket repo using mercurial. We're actually 3 to work on it, so we're using branches.

When we did merges, we did them quite randomly so many times it failed.

Actually, I'm using Meld, and I don't really know in "which" part of the repo I have to choose which part of the source code I want to merge.

So, when I do merge, where should I do it ? I'm not really sure if I have to do it on local, base or other, even though I know local corresponds to my last modifications, other corresponds to the last modifications of the branch I want to merge, and well, actually I'm not really sure about what is other ...

Upvotes: 1

Views: 1071

Answers (2)

Jonathan
Jonathan

Reputation: 7098

On careful review, I have found it out. You want to merge into local Please correct me if I'm wrong but I am pretty sure after doing some tests

Local

The correct place to merge change to. The local files that will result from the merge. This will likely contain a mix of some auto-merged lines already.

Base

Where you are merging into.

Other

The merges you're pulling

Upvotes: 2

Jonathan
Jonathan

Reputation: 7098

This may not be the "right" answer, but when in doubt, I make them ALL match by making them look ALL merged 'correctly' (sometimes I have to discuss with my coworkers what the 'correct' look is based on their changes).

By doing this, I ensure the merge will be successful because meld cannot and will not actually change upstream data in mercurial. So there's no downside. For the life of me I also cannot tell which pane to merge into (mostly because the term 'base vs local' is ambiguous). So this is kind of an odd way to do it, but it works

Upvotes: 1

Related Questions