Uploaded image for project: 'MATSim'
  1. MATSIM-678

Enforce a strict commit policy for MATSim-main

    Details

    • Type: Task
    • Status: Open
    • Priority: Major
    • Resolution: Unresolved
    • Affects Version/s: None
    • Fix Version/s: None
    • Component/s: None
    • Labels:

      Description

      This presupposes main is its own repository ( MATSIM-676 Resolved and MATSIM-677 Open ).

      The git history is difficult to read, and makes it difficult to make a changelog from release to release. Given the "main" part of the code would live on its own isolated repository, one could use a stricter git policy, helping tracking the changes. One possible workflow is:

      • There is a branch that contains only releases (typically master, could be another one if it is easier)
      • there is a "development" branch, that contains the current development version (could be made master, if this makes the creation of Maven snapshots easier)
      • all development happens in branches or forks, with a clear summary of the changes in the merge commit / pull request.

      see for instance http://nvie.com/posts/a-successful-git-branching-model/ for a more detailed description of this model. There might be alternative models that fit our organization better, but the main focus should be to make changes as easy to track as possible.

        Attachments

          Issue links

            Activity

              People

              • Assignee:
                Unassigned
                Reporter:
                thibautd Thibaut Dubernet
              • Votes:
                0 Vote for this issue
                Watchers:
                2 Start watching this issue

                Dates

                • Created:
                  Updated: