[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Changes to emacs-23 branch and the trunk
|
From: |
Kenichi Handa |
|
Subject: |
Re: Changes to emacs-23 branch and the trunk |
|
Date: |
Thu, 02 Sep 2010 14:33:42 +0900 |
In article <address@hidden>, Eli Zaretskii <address@hidden> writes:
> I think the next time you merge with the trunk, the remembered parent
> location will be reset to the trunk. If you want to be sure, you
> could use the --remember option to "bzr merge":
> cd work && bzr merge --remember ../trunk
> or something similar.
Thank you. "bzr merge --remember ../trunk" worked.
---
Kenichi Handa
address@hidden