Skip to main content
Enterprise Agile Planning icon with arrows

This post is from the CollabNet VersionOne blog and has not been updated since the original publish date.

Last Updated Nov 16, 2012 — Enterprise Agile Planning expert

SVN settings in CloudForge – Easy to use and understand!

Enterprise Agile Planning

Have you ever encountered (broken) code that has lines like this…?

<<<<<<< .mine
# This developer has no idea how to merge
=======
# This developer knows how to code
>>>>>>> .r6

In case you didn’t know, those are Subversion (SVN) conflict markers that should have been resolved (deleted) by the previous developer before that code was committed.  But don’t be alarmed, committing markers could happen to the best of us,  right?  Well, with these easy settings, it doesn’t need to happen to anyone using CloudForge.  In addition, a few other nuances can be prevented as well.

When you are ready, login to CloudForge > Admin > Global Settings

global settings

With the Commit Hooks settings, you can easily:

Set Case Insentive Filenames
CloudForge SVN servers are running on Linux boxes.
Linux uses a “case-sensitive” filesystem, which means that two developers can successfully checkin: “foo.rb” and “Foo.rb” at the same location as they are different files.  However, if you are checkin out that code into your “case-insensitive” filesystem (AKA Mac or Windows), the checkout will most likely fail due to file conflict.  Messy huh?  Yes, however easily avoidable in CloudForge by setting to ON the “Case Insentive Filenames” feature.

Block Empty Log Messages
Kindly encourage your peers to leave commit messages…by forcing them.  This will ensure that every commit has a log message making it a lot easier for everyone to know what was changed – and keeping good practices.

Block Merge Conflicts
This will help you and your team avoid committing those lovely  “>>>>>>>”  markers from the code in your repository, and breaking it.  If someone forgets to properly merge their code, and just commits, your CloudForge repository will simply reject the commit.

SVN Settings

Have questions?  We look forward to answering them!  Email us to support@cloudforge.com

 

More from the Blog

View more
Jul 27, 2021

Digital.ai Becomes First to Achieve FedRAMP Moderate “In Process” Status for Enterprise Agile Planning Solution

Enterprise Agile Planning
Digital.ai, the leading AI-driven DevOps value stream delivery, and ma ...
Read More
Jun 21, 2021

How Agile can be implemented effectively across the organization

Enterprise Agile Planning
Just a few decades ago, a “disruption” was seen as an undesirable thin ...
Read More
May 31, 2021

Agile change management processes are key to delivering software faster

Enterprise Agile Planning
With its emphasis on delivery value faster, agile product management s ...
Read More
May 03, 2021

Bringing the agile planning approach to your whole business

Enterprise Agile Planning
The events of the last 12 months have demonstrated that the only sure ...
Read More
Contact Us