CODEWITHSUNDEEP
pythondjangomercurialmergetortoisehg
doniyor
doniyor

Reputation: 37904

version control- merge two branches - [abort: uncommitted changes]

I have two branches. default and dev.

default is the main, dev is development branch. Now i did something in dev and committed and pushed to dev with tortoisehg.

Now I want to merge dev into default. what I did: 

hg update default
hg merge dev.

but I am getting this:
abort: outstanding uncommitted changes (use 'hg status' to list changes).

what should I do to get the dev changeset into default?

please help.

Upvotes: 1

Views: 588

Answers (1)

Ry4an Brase
Ry4an Brase

Reputation: 78350

Commit. It's telling you that. hg merge is an operation that includes the working directory, and if your working directory has uncommitted changes you're asking Mercurial to start a process that you couldn't safely cancel.

Upvotes: 3

Related Questions