For those new to git ... this is a nice read: http://tom.preston-werner.com/2009/05/19/the-git-parable.html
Am 06.04.2013 01:06, schrieb Justin Mclean: > Hi, > >> Okay, at its heart, the danger Fred was worried about is that, using a merge >> workflow, the person who pulls the changes needs to make sure they commit >> all changes... even files they didn't touch, because they 'inherit' the >> merge. > Do you have any advice on how to get around this issue in a simple way? > > I would of though that those changes would of already been in develop (99% > of git pulls/git push are going to be from develop right?). Could this issue > occur in the develop branch? If so is it easy to recognise that it has > occurred and what would be the steps to fix it? > >> For those new to git, if you are using this workflow, take a look at >> SmartGit. > Thanks for the pointer will give it a go. > > Thanks, > Justin -- _____ FORMER 03 GmbH _____ infanteriestraße 19 haus 6 _____ 80797 muenchen _____ robert.brend...@former03.de _____ www.former03.de _____ fon 089.322112.28 _____ fax 089.322112.11 _____ geschäftsführer _____ sebastian fiedler _____ gert zellentin _____ handelsregister _____ HRB München 148468 _____ steuer _____ ust.-id DE 229107876 _____ TWITTER: http://twitter.com/FORMER03 _____ FACEBOOK: http://www.facebook.com/former03 _____ GOOGLE+: https://plus.google.com/109396067810508286409/posts _____ YOUTUBE: http://www.youtube.com/former03gmbh
