On Fri, 2012-05-18 at 21:15 +0000, Spear, Raymond (Mission Critical Linux) wrote: > well do. > > we make some local customization of files like the global_config.ini > > when I try to do a pull git always complains about our local changes and > doesn't pull. > is the a way to "Pull" and keep my local changes??
Yes, there is: -------------------------------------------------------------------- 1) create a branch, say hp: git checkout -b hp 2) verify your local changes to global_config.ini: git diff 3) when you see it's all ok, you can commit your changes: git commit -as -m "global_config.ini settings" 4) Now, every time you want to update your branch you could do the following: git checkout master 5) pull the changes git pull 6) change back to the hp branch git checkout hp 7) rebase your changes against master git rebase master -------------------------------------------------------------------- The above should do the work. Cheers, Lucas _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
