On 10/05/2012 12:49 am, Brad wrote:
Could 'Merge branch
master, remote-tracking branch origin' be what happens if I accidentally
typed git merge origin master? If I do this, what happens exactly?
Good guesswork!
One of git's merge algorithms is called an 'octopus merge', and merges
more than
Hi, I have a single branch (master). I am using a remote git server
(bitbucket) to push my changes to and pull them back down from (technically
I always do 'git fetch' and then 'git merge origin/master' rather than 'git
pull').
Occasionally I'll notice that after doing the operation that I
