ressister wrote: > Hi there, > > I have a revision, #238 which I've since made changes to and committed > so I'm now on revision #240. I'm not happy with the direction that > I've gone since the two commits I've made, and I want #238 to be the > base. I wouldn't mind keeping #240 around, which i could just do with > a local copy. > > When I update to #238 and make changes to it, building off it which i > want to do, anytime I commit, i get a conflict with one of the files > being out of date. What can i do to make #238 the working build so I > can develop off of that?
I think you want to "branch". I'm not sure of the exact syntax but you should be able to checkout #238, branch it off and change it, then make that branch the main and have #240 as a fork. HTH Matt --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Ruby on Rails: Talk" group. To post to this group, send email to rubyonrails-talk@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/rubyonrails-talk?hl=en -~----------~----~----~----~------~----~------~--~---
