On Monday 20 November 2006 08:49, Jakub Narebski wrote: > On Mon, 20 Nov 2006, Paolo Ciarrocchi wrote: > >>> -made in each. To merge the changes made in the two branches, run > >>> +made in each. To merge the changes made in experimental into master > >> I would rather say: > >> To merge the changes made in the two branches into master, run > > > > Why Jakub? There are only two branches, master and experimental. > > While sitting in master and doing git pull . experimental I would > > expect to merge I did in experimental into master. Changes did in > > master are alreay merged in master. Am I wrong? > > For me, "merge" in "to merge the changes" phrase is merge in common-sense > meaning of the world, not the SCM jargon. Merge the changes == join the > changes, so you have to give both sides, both changes you join. > > Merge the changes == take changes in branch 'experimental' since forking, > take changes in branch 'master' since forking, join those changes > together (merge), and put the result of this joining (this merge) into > branch 'master'. > > On the contrary, in "merge branch 'experimenta' into 'master'" phrase > "merge" is in the SCM meaning of this word. > > > Just my 2 eurocoents of not native English speaker... As a native English speaker the way the tutorial was before any of these changes meant that the contents of experimental and master had merged into one, but there was not specific indication of where this merged result had been put >From _your_ phrasing I took the meaning that there were two independent branches which then got merged into master although that leaves me puzzled because there is only one other independant branch and thats the experimental one I think the wording Paolo used is clearer and precisely right - we are merging the experimental stuff into master and experimental remains as it was (although in a fast forward experimental and master end up the same - this is not true in the example in the tutorial which says that changes are made on both branches). -- Alan Chandler http://www.chandlerfamily.org.uk - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html