Tagged Questions

2
votes
1answer
179 views

svn - when will I see conflicts?

I am just starting a new position and using svn rather than git (my favorite). With svn if there are any conflicts will I see them after an svn update or after an (attempt) to svn commit? In other ...