·
54 commits
to master
since this release
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.
Changelog
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)