Newbie question - change set mess-up
Ned Konz
ned at bike-nomad.com
Fri Jul 11 18:29:39 UTC 2003
On Friday 11 July 2003 10:57 am, Arndt Jenssen wrote:
> Hi there
>
> I've changed classes from a projects' change set from the root and
> from within another project (unfortunately). Now I get errors when
> filing-in the fileout from the project in question in a vanilla
> image.
>
> How can I combine the changes made in other change sets to one
> change set? How can I resolve the conflicts?
>
> I can remove classes from a change sets, but I cannot add new ones.
> Is that so? If not I could have a fresh start and create a
> completely new change set and add the classes I need.
Open a dual change sorter.
On the right-hand side, select the change set to which you want to add
changes.
On the left hand side, select a change set whose changes you want to
add to the other.
Now you can say (from the left hand context menu) copy all changes to
other side.
You can also subtract, submerge, move, etc., changes (either all in a
change set or a class or method at a time) to the change set on the
other side.
This will work in either direction.
--
Ned Konz
http://bike-nomad.com
GPG key ID: BEEA7EFE
More information about the Squeak-dev
mailing list
|