Gestire i tree conflict di SVN: Difference between revisions

Latest revision as of 10:52, 1 July 2010

svn resolve --accept working resource.name

Revision as of 10:27, 22 June 2010 view source Gabriele.vivinetto (talk \| contribs) Administrators 7,528 edits m New page: svn resolve --accept working *[http://stackoverflow.com/questions/767763/svn-how-to-resolve-new-tree-conflicts-when-file-is-added-on-two-branches/2207119#2207119 SVN how to resolve new t...		Latest revision as of 10:52, 1 July 2010 view source Gabriele.vivinetto (talk \| contribs) Administrators 7,528 edits mNo edit summary
Line 1:		Line 1:
	svn resolve --accept working		svn resolve --accept working resource.name

	*[http://stackoverflow.com/questions/767763/svn-how-to-resolve-new-tree-conflicts-when-file-is-added-on-two-branches/2207119#2207119 SVN how to resolve new tree conflicts when file is added on two branches - Stack Overflow]		*[http://stackoverflow.com/questions/767763/svn-how-to-resolve-new-tree-conflicts-when-file-is-added-on-two-branches/2207119#2207119 SVN how to resolve new tree conflicts when file is added on two branches - Stack Overflow]