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
Digital.ai Government Cloud
Apr 12, 2022

Digital.ai Government Cloud receives FedRAMP Authorization through sponsorship from the United States Department of Veterans Affairs

Enterprise Agile Planning
Flagship Digital.ai Agility solutions can effectively scale agile deve ...
Read More
Nov 22, 2021

What are the qualities of highly effective agile teams?

Enterprise Agile Planning
A team is the core unit of productivity in an agile organization. Wher ...
Read More
Nov 15, 2021

How an open-first attitude revolutionized government tech development

Enterprise Agile Planning
Public perception of government is often that it is slow-moving, reluc ...
Read More
cross functional
Nov 08, 2021

6 best practices for building resilient cross-functional teams

Enterprise Agile Planning
Agile frameworks prize the quality of resilience within every facet of ...
Read More
Contact Us