Ing. Lubomir VALEK wrote: > I ussually use SVN on other projects. > What is different at GIT?
Very much is different with git. Please take the time to listen to the author Linus Torvalds' talk about git: http://www.youtube.com/watch?v=4XpnKHJAok8 > And merge is done automatically. > Is this possible also at GIT? Yes of course, but it would probably be better if you use what is called rebase, instead of merge. > Can anybody help, and suggest some steps to do it right way? You need to commit your changes. Each repository clone is a full repo, so when you commit you are only saving one change in your clone. After you have committed, run this command to update your codebase: git pull origin master --rebase Rebase means that your local changes will be put to the side, the repo synced with the upstream repo, then your local changes will be applied again. There may be a conflict at that time, and you'll have to resolve it and create a new commit. Please read the documentation for these git commands (pull, rebase and merge) after listening to Linus' talk. //Peter _______________________________________________ Openocd-development mailing list [email protected] https://lists.berlios.de/mailman/listinfo/openocd-development
