On Mon, Jul 13, 2009 at 1:13 AM, Yocto<[email protected]> wrote: > Hi > >>> Are you using git to manage the "merge"? > > I shouldn't have call it a merge since I simply git pull your stuff into a > branch. > I tried to use "git mergetool" (emerge = emacs) ... > But reverted to a 'grep -Rn "<<<<<<<" * ' and then the good old vi. :)
Similarly I use git to auto-merge where it can but I haven't bothered with "git mergetool" for conflicts. I tried it briefly while repackaging all these commits but reverted to old habits of diff, vim and emacs. "git diff" is very useful too, particularly "git diff HEAD" and "git diff "some_branch" to get a feel of the changes from different perspectives. > > Thanks for the tips, I will use this opportunity to master git. > > I'm using Prex on the beagle board. > Credits goes to Richard Pandion for the port. ( rpandion at gmx.com || > rpandion at caramail.com ) I was hoping that you and Richard were not duplicating efforts! Andrew ------------------------------------------------------------------------------ Enter the BlackBerry Developer Challenge This is your chance to win up to $100,000 in prizes! For a limited time, vendors submitting new applications to BlackBerry App World(TM) will have the opportunity to enter the BlackBerry Developer Challenge. See full prize details at: http://p.sf.net/sfu/Challenge _______________________________________________ Prex-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/prex-devel
