@@ -0,0 +1,70 @@ +http://martinfowler.com/bliki/SemanticConflict.html + +ç§ãååã¨[[FeatureBranch]](訳注ï¼æ©è½ãã©ã³ã)ã«ã¤ãã¦è©±ãã¦ããã®ãè´ãã人ã¯ãæã ããã®ãã¿ã¼ã³ã®å¤§ãã¡ã³ã§ã¯ãªãã¨ãããã¨ãç¥ã£ã¦ããã +æã ã®åè«ã®éè¦ãªç¹ã¯ããã©ã³ãä½æã¯ç°¡åã ãããã¼ã¸ã¯å¤§å¤ã ã¨ããè¦è§£ã«ããã +ææè³ã«ããè°è«ã¨ãã¦ã¯ãã¢ãã³ãª[[VersionControlTools]]ãããã°ã +ãã¼ã¸ã¯ååã«ç°¡åã«ãªãã®ã§ãæ©è½ãã©ã³ãã«ã¯è¡ã価å¤ãããã¨ãããã®ãããã + +確ãã«ãã¢ãã³ãªãã¼ã«ã¯ãç§ãè¥ãé ããããã¼ã¸ã«é¢ãã¦ãã£ã¨ããä»äºããã¦ãããããã®å¨åã®ããä¾ã®ä¸ã¤ãããªãã¼ã ãã¦ããã¼ã¸ãã¦ãããã¨ãããã®ã§ããã +ç§ã{{code('lorem.rb')}}ã®
{{#tags}}- {{label}}
{{/tags}}