Gentlemen, 6.06 git trunk did a 'git pull' this morning and received a message the download could not merge the 'Makefile' I checked permissions and ownership of my 'Makefile' The ownership was/is the same as all the other files in that directory this seemed innocuous so I changed my personally modified Makefile to another name redid the git I checked the permissions/ownership of the new Makefile and my renamed Makefile The permissions/ownership of the files are the same I diffed the files and saw the only change (other than my personal changes) was a destdir in two places I made my changes in the new Makefile - no problem as they are not extensive What can I do to allow git to merge the changes into my 'Makefile'? Are there 'git' options that allow/cause the merge to happen? thanks Stuart -- you can lead a person to knowledge but you cannot make him think
------------------------------------------------------------------------------ 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 _______________________________________________ Emc-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-users
