On Mon, Feb 23, 2009 at 08:34:59AM +1300, Bryan Ischo wrote: > Well I find git to be kind of painful, to be honest. Maybe I'm not > using it correctly? Every git command is very fast, but there are so > many of them to run as part of recreating patches, and so many little > details to get right every time.
Have a look at `man git-rebase` If you're in a branch called 'old' and want to update your patches to apply cleanly to master you would just do `git rebase master`. Files with conflicts will have special markers similar to what svn does when there are conflicts updating or merging like: Just edit the file so the patch is as you intend, and continue with the rebase. <<<<<<< HEAD:README Blah foo ======= Blah bar bar >>>>>>> Put some bar after the Blah.:README Cheers. _______________________________________________ pacman-dev mailing list [email protected] http://www.archlinux.org/mailman/listinfo/pacman-dev
