Prepare 0.4.0

CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.4.0
+
+## Improvements
+
+* Allow manual resolution of conflicts in `sit-mr-merge` (de11681d-0ecf-493f-8dec-3ed9ec68b0d1)
+* Allow creating merge requests from any branch (9d843fb8-8c4d-45ba-8b32-c61bec8e3af6)
+
+## Bugfixes
+
+* Updating issue with a merge request for new details hides merge request (cbb8836c-2918-4175-8b3b-d595e562504d)
+
 # 0.3.0
 
 First independent release of `issue-tracking` module. No significant changes.

README.md

@@ -3,7 +3,7 @@
   <a href="http://sit-it.org"><img src="https://raw.githubusercontent.com/sit-it/sit/master/logo.png" alt="Markdownify" width="150"></a>
   <br>
   <br>
-  SIT
+  SIT Issue Tracking
   <br>
 </h1>
 
@@ -22,11 +22,11 @@
   ]
 </p>
 
-SIT is a compact tool to track and share project issues in and between
+SIT Issue Tracking is a compact tool to track and share project issues in and between
 decentralized teams. Its goal is to lower the barrier for having an independently
 operated, shared issue tracker. Instead of having to setup and maintain a server
 and a database, or having to rely on services of an external third party, SIT can
-be initialized and started as simply as this:
+be initialized with it and started as simply as this:
 
 ```
 $ sit init

RELEASE_NOTES.md

@@ -1,3 +1,17 @@
+# 0.4.0
+
+In this release, a couple of issues have been solved. Most importantly,
+`sit-mr-merge` will now allow to manually resolve a conflict. It's now
+doing a three-way merge and if re-ran in a merge request branch, it will
+pick up manual changes and carry on.
+
+Also, it is now possible to create merge requests from branches other than
+`master`.
+
+An important bugfix dealing with displaying merge requests has been applied.
+
+This release also features an updated theme to match new SIT's logo.
+
 # 0.3.0
 
 This is the first separate release of `issue-tracking` modules. No significant