Mcav feature branch

.clang-format

@@ -10,6 +10,6 @@ ConstructorInitializerIndentWidth: 0
 ContinuationIndentWidth: 2
 DerivePointerAlignment: false
 PointerAlignment: Middle
-ReflowComments: false
+ReflowComments: true
 IncludeBlocks: Preserve
 ...

.github/dependabot.yml

@@ -11,3 +11,10 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the
+    # default location of `.github/workflows`
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "humble"

.github/mergify.yml

@@ -0,0 +1,42 @@
+pull_request_rules:
+  - name: Backport to humble at reviewers discretion
+    conditions:
+      - base=master
+      - "label=backport-humble"
+    actions:
+      backport:
+        branches:
+          - humble
+
+  - name: Ask to resolve conflict
+    conditions:
+      - conflict
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @{{author}}?
+
+  - name: Ask to resolve conflict for backports
+    conditions:
+      - conflict
+      - author=mergify[bot]
+    actions:
+        comment:
+          message: This pull request is in conflict. Could you fix it @bmagyar @destogl @christophfroehlich @saikishor?
+
+  - name: development targets master branch
+    conditions:
+      - base!=master
+      - author!=bmagyar
+      - author!=destogl
+      - author!=christophfroehlich
+      - author!=saikishor
+      - author!=mergify[bot]
+      - author!=dependabot[bot]
+    actions:
+        comment:
+          message: |
+            @{{author}}, all pull requests must be targeted towards the `master` development branch.
+            Once merged into `master`, it is possible to backport to `{{base}}`, but it must be in `master`
+            to have these changes reflected into new distributions.

.github/pull_request_template.md

@@ -1,5 +1,5 @@
 ## General
-Please consider the guidelines from [CONTRIBUTING.md](CONTRIBUTING.md) before you open a pull request.
+Please consider the guidelines from [CONTRIBUTING.md](https://github.com/ros-controls/.github/blob/master/CONTRIBUTING.md) before you open a pull request.
 
 ## New Examples
 If you propose adding a new example, make sure that your new example has: