I use Beyonf Compare for stuff like this and I have to say I probably couldn't live without this tool now, it is soooo useful. You can compare files locally, or even an FTP connection and deploy changes to your live site this way. you can merge line by line of course.
Seriously, try it out, the trial version never expires either. http://www.scootersoftware.com/ Russ On Wed, Jul 27, 2011 at 6:22 PM, Larry Lyons <[email protected]> wrote: > > If I remember correctly, you can also cherry pick your final commits in > git. So effectively that's a line by line commit. > > > With Git and Mercurial, you can "shelve" changes. So if you are part > > way through a big change and something important comes in, you can > > tell the source control system to stash the current changes out of > > the > > way, go back to your version prior to the current changes, make the > > new important changes and commit them, then pull the uncommitted > > stuff > > you were working on back into your working branch and go on your > > merry > > way. > > > > Judah > > > > On Wed, Jul 27, 2011 at 9:28 AM, Shannon Rhodes <Shannon@rhodesedge. > > com> wrote: > > > > > > Yeah, what Dave said...I'm talking about committing part of a file, > > not part of a project. > > ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~| Order the Adobe Coldfusion Anthology now! http://www.amazon.com/Adobe-Coldfusion-Anthology/dp/1430272155/?tag=houseoffusion Archive: http://www.houseoffusion.com/groups/cf-talk/message.cfm/messageid:346372 Subscription: http://www.houseoffusion.com/groups/cf-talk/subscribe.cfm Unsubscribe: http://www.houseoffusion.com/groups/cf-talk/unsubscribe.cfm
