For general rambling.
Jonathan
Grand Pooh-Bah
Posts: 6722 Joined: Tue Sep 19, 2006 8:45 pmLocation: Portland, OR
Contact:
Post
by Jonathan Wed Nov 19, 2008 7:29 pm
SVN: when merging, say, trunk changes onto your branch, SVN flags every change as a conflict.
quantus
Tenth Dan Procrastinator
Posts: 4891 Joined: Fri Jul 18, 2003 3:09 amLocation: San Jose, CA
Post
by quantus Wed Nov 19, 2008 8:45 pm
What version of SVN? If it's older than 1.5, then this is unfortunately expected since merge support sucked.
Jonathan
Grand Pooh-Bah
Posts: 6722 Joined: Tue Sep 19, 2006 8:45 pmLocation: Portland, OR
Contact:
Post
by Jonathan Wed Nov 19, 2008 10:08 pm
I switched my version to 1.5 just for this reason. It still sucks.
quantus
Tenth Dan Procrastinator
Posts: 4891 Joined: Fri Jul 18, 2003 3:09 amLocation: San Jose, CA
Post
by quantus Wed Nov 19, 2008 11:14 pm
The repository needs to be 1.5 as well...
Jonathan
Grand Pooh-Bah
Posts: 6722 Joined: Tue Sep 19, 2006 8:45 pmLocation: Portland, OR
Contact:
Post
by Jonathan Wed Nov 19, 2008 11:24 pm
Hmph.
quantus
Tenth Dan Procrastinator
Posts: 4891 Joined: Fri Jul 18, 2003 3:09 amLocation: San Jose, CA
Post
by quantus Thu Nov 20, 2008 1:53 am
git-svn