CodePlexProject Hosting for Open Source Software
I have a fork of orchard @ http://orchard.codeplex.com/SourceControl/network/forks/AimOrchard/AimOrchard?branch=1.x with our custom changes.
I wish to update this now so that I'm in sync with the orchard 'trunk' (default branch) and retains our custom changes, but I just can't figure out how to do it :s
Help on this would be greatly appreciated!
Edit: Looks like I got further, going to commit soon see what it'll do ;p
Edit(2): Could anyone please look at http://orchard.codeplex.com/SourceControl/network/forks/AimOrchard/AimOrchard?branch=default and
tell me if that looks ok?
It looks OK to me, a the files that were modified with 1.4 got overwritten (although the number of changes seem a bit small). Actually how have you done that?
Mix of pulling from the orchard repo, merging with its 'default' (into my 1.x), then hg update to my 'default' and finally hg merge with my '1.x'
At least, I think that's what I did :s
I see, thanks.
Are you sure you want to delete this post? You will not be able to recover it later.
Are you sure you want to delete this thread? You will not be able to recover it later.