I have a checked out copy of bacula. I made some changes and sent the resulting 'git diff' to kern, and it appears to have been committed. In between sending the 'git diff' and the subsequent 'git pull', I also made some additional changes, and now git pull won't update my tree properly as the patches don't apply cleanly.
The subsequent changes are only minor (just a few lines), is there something easy that I just don't know how to do, or should I just save the current diff, do a patch -R, and then reapply manually? Thanks James ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Bacula-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/bacula-devel
