On 16.12.2010 16:39, Peter Stuge wrote: > Hm. Did you actually rename the file, or copy/paste into a new file? > Maybe the line endings got switched around; git usually has > unix-style line endings for all files, and can do automatic > conversion on checkout if desired. Once that starts getting used > (question with default value yes during msysgit installation) there > can be many unexpected situations if not prepared for exactly what > git does to the files. >
I thought I had the Line-ending stuff in place: core.autocrlf=false core.safecrlf=true Probably it was an error to keep two branches and merge them by hand. I've made the changes in a temporary test environment and tried to merge the stuff. 1. cloned openocd's GIT repo 2. git mv tcl/target/netx500.cfg tcl/target/hilscher_netx500.cfg 3. Copied hilscher_netx500.cfg from temp 4. git add tcl/target/hilscher_netx500.cfg 5. git commit Probably i shouldn't have added the file again after modification, or don't copy it? Michael _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
