Received: from fallback.us4.outblaze.com (fallback.us4.outblaze.com [205.158.62.120]) by sdf.lonestar.org (8.12.10/8.12.10) with ESMTP id iAM4aZvo017134 for ; Mon, 22 Nov 2004 04:36:36 GMT Received: from cspf.us4.outblaze.com (cspf.us4.outblaze.com [205.158.62.117]) by fallback.us4.outblaze.com (Postfix) with ESMTP id B3EB81C1A6D9 for ; Mon, 22 Nov 2004 02:50:24 +0000 (GMT) Received: from spf3.us4.outblaze.com (spf3.us4.outblaze.com [205.158.62.25]) by cspf.us4.outblaze.com (Postfix) with ESMTP id 7F1E51B408D for ; Mon, 22 Nov 2004 02:50:24 +0000 (GMT) Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by spf3.us4.outblaze.com (Postfix) with ESMTP id 0FA25545A5 for ; Mon, 22 Nov 2004 02:50:24 +0000 (GMT) Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW4Qa-0002N4-2Q for migo@homemail.com; Sun, 21 Nov 2004 21:59:44 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.33) id 1CW4Pb-00028k-Gw for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:58:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.33) id 1CW4Pa-00028D-Fv for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:58:42 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.33) id 1CW4Pa-000283-ED for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:58:42 -0500 Received: from [64.233.184.207] (helo=wproxy.gmail.com) by monty-python.gnu.org with esmtp (Exim 4.34) id 1CW4GA-0004Cn-LI for gnu-arch-users@gnu.org; Sun, 21 Nov 2004 21:48:58 -0500 Received: by wproxy.gmail.com with SMTP id 67so156603wri for ; Sun, 21 Nov 2004 18:48:58 -0800 (PST) DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:message-id:date:from:reply-to:to:subject:mime-version:content-type:content-transfer-encoding; b=YGOGdhrBo8uk1+lu6smQwygdDSwihR7iJge6rdzFN1/gPCyTmmtROQtlyR9VRl1UKexAJSpNpcjVPItbVLlD9wvHqjv2rgBSMAgMKPXmJTBgv+I6hifyz3lnCnHqe4jpSlEQAreil40B1I8Y2HVM3POLIYX3L2ADrnubQWGnsls= Received: by 10.54.53.30 with SMTP id b30mr1515941wra; Sun, 21 Nov 2004 18:48:57 -0800 (PST) Received: by 10.54.45.70 with HTTP; Sun, 21 Nov 2004 18:48:57 -0800 (PST) Message-ID: Date: Mon, 22 Nov 2004 10:48:57 +0800 From: Alex Ng To: gnu-arch-users@gnu.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Gnu-arch-users] star-merge problem X-BeenThere: gnu-arch-users@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alex Ng List-Id: a discussion list for all things arch-ish List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: gnu-arch-users-bounces+migo=homemail.com@gnu.org Errors-To: gnu-arch-users-bounces+migo=homemail.com@gnu.org Status: RO Content-Length: 706 Lines: 24 Could someone please help me with this problem? I have a main development branch. I branched off a while back and made various changes on this sub-branch. On the main branch, other work was carried out which included the addition of a new directory. Now, when I try to star-merge my changes from the sub-branch back into the main branch, the merge somehow tries to remove the new directory in the main branch! Why is it doing this and how do I get around it? Thanks in advance, Alex _______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/