On 01/21/13 06:00, Ivanko B wrote: > Branching with merging & stashing is nightmare to understand :)
Why? If you pull new changes, make sure you don't have any local modifications which could cause a conflict while pulling. So, simply stash your changes, then do a pull. Same applies to merging. After you have done a pull, if you then pop the stashed changes, conflicts are much less likely, because git will automatically discard changes from the stash which are already in the repository history. If you change branches that are very similar, then it isn't always necessary to stash local changes. I will do this for example, when I want to switch branches and actually commit my current local changes. I've been working like this for years, and it works wonderful. Regards, - Graeme - -- fpGUI Toolkit - a cross-platform GUI toolkit using Free Pascal http://fpgui.sourceforge.net/ ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122412 _______________________________________________ mseide-msegui-talk mailing list mseide-msegui-talk@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mseide-msegui-talk
