testGit-nl_NL.po

{

  "type" : "page",

  "status" : "current",

  "title" : "Test ",

  "version" : {

    "by" : {

      "type" : "known",

      "username" : "thomas.biesaart",

      "userKey" : "ff8080814f06cd68014f06cd8cf0001f",

      "profilePicture" : {

        "path" : "/wiki/aa-avatar/3b9d6130b900defc8ddc33865646a063?s=48&d=https%3A%2F%2Fxillio.atlassian.net%2Fwiki%2Fdownload%2Fattachments%2F557059%2Fuser-avatar%3FnoRedirect%3Dtrue",

        "width" : 48,

        "height" : 48,

        "isDefault" : false

      },

      "displayName" : "Thomas Biesaart"

    },

    "when" : "2016-10-24T08:38:49.832+02:00",

    "friendlyWhen" : "Oct 24, 2016",

    "message" : "",

    "number" : 7,

    "minorEdit" : false

  },

  "ancestors" : [

    {

      "id" : "557067",

      "type" : "page",

      "status" : "current",

      "title" : "Development Home",

      "extensions" : {

        "position" : "none"

      },

      "_expandable" : {

        "childTypes" : "",

        "container" : "/rest/api/space/DEV",

        "metadata" : "",

        "operations" : "",

        "children" : "/rest/api/content/557067/child",

        "restrictions" : "/rest/api/content/557067/restriction/byOperation",

        "history" : "/rest/api/content/557067/history",

        "ancestors" : "",

        "body" : "",

        "version" : "",

        "descendants" : "/rest/api/content/557067/descendant",

        "space" : "/rest/api/space/DEV"

      },

      "_links" : {

        "self" : "https://xillio.atlassian.net/wiki/rest/api/content/557067",

        "webui" : "/display/DEV/Development+Home",

        "tinyui" : "/x/C4AI"

      }

    },

    {

      "id" : "10780784",

      "type" : "page",

      "status" : "current",

      "title" : "Getting started",

      "extensions" : {

        "position" : 0

      },

      "_expandable" : {

        "childTypes" : "",

        "container" : "/rest/api/space/DEV",

        "metadata" : "",

        "operations" : "",

        "children" : "/rest/api/content/10780784/child",

        "restrictions" : "/rest/api/content/10780784/restriction/byOperation",

        "history" : "/rest/api/content/10780784/history",

        "ancestors" : "",

        "body" : "",

        "version" : "",

        "descendants" : "/rest/api/content/10780784/descendant",

        "space" : "/rest/api/space/DEV"

      },

      "_links" : {

        "self" : "https://xillio.atlassian.net/wiki/rest/api/content/10780784",

        "webui" : "/display/DEV/Getting+started",

        "tinyui" : "/x/cICk"

      }

    }

  ],

  "body" : {

    "storage" : {

      "value" : "<ac:layout><ac:layout-section ac:type=\"single\"><ac:layout-cell><p>The simple branching&nbsp;flow is a branching model that is similar to the classic 'trunk based development' workflow but leverages most of the benefits of git while remaining very simple. It focuses on three basic principles.</p><h2>Master is Deployable</h2><p>Similar to how git-flow works with develop, the master branch works like a stable branch. This branch <strong>can always be deployed</strong> and should always function as expected. People who want the very latest versions of the software can run on this branch. This is also where nightlies can be built. The way this branch is kept in check is by finished (isolated) feature completely before merging it. This means it will go through planning, implementation, automated testing, user testing and acceptance before it is merged.</p><h2>Create Pull Requests Early</h2><p>Pull requests are a central place of communication about an issue. By creating them early you will have a place where an issue can be discussed and the development can be tracked. This means declining a pull request only really happens when it is decided that the proposed solution is incorrect or the issue will be dropped. In other words:&nbsp;<strong>Declined pull request means stop working on this issue</strong>.</p><h2>Never Close Release Branches</h2><p>Releases are permanent. This means <strong>release branches should be permanent too</strong>. Once a release branch is created, this branch can be used to create new minor releases by cherry picking features and fixes from master.</p><p><br /></p></ac:layout-cell></ac:layout-section><ac:layout-section ac:type=\"three_equal\"><ac:layout-cell><h2>Development Workflow</h2><p><ac:image><ri:attachment ri:filename=\"development_workflow-draw.io.png\" /></ac:image></p></ac:layout-cell><ac:layout-cell><h2>Major Release Workflow</h2><p><ac:image><ri:attachment ri:filename=\"major_release_workflow-draw.io.png\" /></ac:image></p></ac:layout-cell><ac:layout-cell><h2>Minor Release Workflow</h2><p><ac:image><ri:attachment ri:filename=\"minor_release_workflow-draw.io.png\" /></ac:image></p></ac:layout-cell></ac:layout-section></ac:layout>",

      "representation" : "storage"

    }

  },

  "extensions" : {

    "position" : 4

  },

  "xdip" : "xdip://confluence01/DEV/57278472"

}