Pull requests

#1 Open
Repository
gonzalfj gonzalfj
Branch
default
Repository
skypher skypher
Branch
default

Option --force and symbolic links(email)

Bitbucket cannot automatically merge this request due to conflicts.

Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:

hg update default
hg pull -r default https://bitbucket.org/gonzalfj/fdisk
hg merge 8f6a5f335668
hg commit -m 'Merged in gonzalfj/fdisk (pull request #1)'
Author
  1. Fabio Gonzalez
Reviewers
Description

This is what I sent you by email. But, still has a problem: I think the changes are including files created and modified automatically.

Comments (1)