[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
RE: Best method to replace a branch's code
From: |
Jim.Hyslop |
Subject: |
RE: Best method to replace a branch's code |
Date: |
Wed, 24 Mar 2004 11:31:18 -0500 |
[bottom-quoting corrected]
> From: address@hidden
> [mailto:address@hidden
> Behalf Of
> Fabian Cenedese
> Checkout branchB, export branchA, copy all A files to B
> sandbox, commit.
> (And maybe add/remove files first).
>
> bye Fabi
Euan Guttridge wrote:
> that solution would flag conflicts, I just want a no
> questions replace..
No, you will only get conflicts if you update from within the branch. Fabi's
approach will work, except you should probably add a step to delete all
working files in B before copying files from A.
--
Jim Hyslop
Senior Software Designer
Leitch Technology International Inc. (http://www.leitch.com)
Columnist, C/C++ Users Journal (http://www.cuj.com/experts)
- Re: Best method to replace a branch's code, (continued)
- Re: Best method to replace a branch's code, Derek Robert Price, 2004/03/24
- Re: Best method to replace a branch's code, Derek Robert Price, 2004/03/24
- Re: Best method to replace a branch's code, Derek Robert Price, 2004/03/24
- Re: Best method to replace a branch's code, Larry Jones, 2004/03/24
- Strange Characters, Gagneet Singh, 2004/03/25
- Re: Strange Characters, Mark D. Baushke, 2004/03/25
- RE: Strange Characters, Gagneet Singh, 2004/03/25
RE: Best method to replace a branch's code, Fouts Christopher (6452), 2004/03/24
RE: Best method to replace a branch's code, Fouts Christopher (6452), 2004/03/24
RE: Best method to replace a branch's code, Andy Jones, 2004/03/24
RE: Best method to replace a branch's code,
Jim.Hyslop <=
RE: Best method to replace a branch's code, Euan Guttridge, 2004/03/25