Berkeley CSUA MOTD:Entry 12511
Berkeley CSUA MOTD
 
WIKI | FAQ | Tech FAQ
http://csua.com/feed/
2025/05/24 [General] UID:1000 Activity:popular
5/24    

2004/3/3-5 [Computer/SW/Unix] UID:12511 Activity:moderate
3/3     What's the best way to incrementally merge files? merge and merge3
        assume you have a main file, then branch, the merge. I want something
        that merges (adds) incrementally. Thanks.
        \_ You want a merge tool that really understands branhes. If you are
           just developing locally prcs will do what you want. If you are
           working with a remote repository you want use a tool like bitkeeper
           that understands branches well. A possible alternative is to create
           a local prcs repository from you remote repository, import the
           merges and then export them back to the remote repository, but I
           have no idea if this will work well or not. --twohey
2025/05/24 [General] UID:1000 Activity:popular
5/24    

You may also be interested in these entries...
2012/5/8-6/4 [Computer/SW/Unix] UID:54383 Activity:nil
5/8     Hello everyone!  This is Josh Hawn, CSUA Tech VP for Spring 2012.
        About 2 weeks ago, someone brought to my attention that our script
        to periodically merge /etc/motd.public into /etc/motd wasn't
        running.  When I looked into it, the cron daemon was running, but
        there hadn't been any root activity in the log since April 7th.  I
        looked into it for a while, but got lost in other things I was
	...
2011/4/6-20 [Computer/SW/Mail, Computer/SW/Unix, Industry/Startup] UID:54078 Activity:nil
4/6     My company is evaluating version control systems. Our two candidates
        are Perforce and Subversion. Anyone worked with both and have good
        arguments one way or the other? (These are the only two options we
        have.) We're most interested in client performance, ease of use, and
        reasonable branching.
        \_ I'll be 'that guy'. If perforce and subversion are optins, why isn't
	...
2009/8/21-9/1 [Computer/SW/Unix] UID:53297 Activity:nil
8/20    When I use rsync to backup, it's pretty cool except in cases where
        I rename a directory name from the source. Rsync will just do
        a plain copy. Is there a program that'll detect renaming of
        directories (by checking for children files), or at least
        move them to a dated directory?
        \_ Not related but beware of using rsync as a backup tool.
	...
2009/4/30-5/6 [Computer/Theory] UID:52923 Activity:nil
4/30    Sorting question!  I have n sorted arrays of doubles.  What's the
        fastest way to sort them into 1 big sorted array?
        \_ as mentioned below: you are describing one half of mergesort
        \_ You really have to ask this question?
           \_ You don't know either, huh?
        \_ If three are n sorted arrays of m doubles each, I think the fastest
	...
2009/4/27-5/4 [Computer/SW/Unix] UID:52913 Activity:nil
4/27    Git, Darcs, or Mecurial?
        \_ If you do not need and will not want anyone on Windows, Git is OK.
           I'm partial to Mercurial, since it's simple, and doesn't pollute
           my directories with .svn, it just has a top-level .hg directory.
           I hear darcs is good if you want to allow multiple people editing
           the same file, since you can merge different changes within a file.
	...
2008/12/2-7 [Computer/SW/Editors/Vi] UID:52143 Activity:nil
12/2    Article 1, Section 6
        No Senator or Representative shall, during the Time for which he was
        elected, be appointed to any civil Office under the Authority of the
        United States, which shall have been created, or the Emoluments whereof
        shall have been encreased during such time
        \_ Stop stomping my changes.
	...
2008/8/14-17 [Computer/SW/Languages/Misc] UID:50866 Activity:nil
8/14    someone messed up their svn motd branch merge script
	...
2008/3/17-21 [Computer/SW/Apps] UID:49481 Activity:kinda low
3/17    Is there a way to compare differences between two substantially
        similar Excel and/or Powerpoint documents other than going through
        them manually?
        \_ In Excel 2003, there is a "Compare and Merge Workbooks..." option
           under the Tools menu.  (But for some reason it is greyed out in my
           Excel 2003.)  In PowerPoint 2003 there is "Compare and Merge
	...