From 6a8e8f1ae4307eab314dffc158525b398e852e38 Mon Sep 17 00:00:00 2001 From: Alexander Schulz Date: Sat, 11 May 2019 21:07:58 +0200 Subject: [PATCH] Updated Developing (markdown) --- Developing.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Developing.md b/Developing.md index 9d6ccf5..ed14536 100644 --- a/Developing.md +++ b/Developing.md @@ -1,22 +1,19 @@ -Nightly Builds -============== -https://schulzalex.de/builds - Contributing ============ -The preferred way to contribute is to fork our repository and submit a pull request against master. +The preferred way to contribute is to fork our repository and submit a pull request against `development` branch. Important Branches ================== -* master - latest development +* development - latest development * feature-\ - one feature branch per issue -* release-\ - release preparation +* release-\ - release preparation and final state +* master - for legacy reasons (update.xml for clients < 7.6.3.21) Upstream branches XCP-ng -> XenServer ====================================== * upstream - [master](https://github.com/xenserver/xenadmin) -* (not created) upstream-7.7 - [release/havana/master](https://github.com/xenserver/xenadmin/tree/release/havana/master) +* [upstream-8.0](https://github.com/xenserver/xenadmin/tree/release/naples/master) * [upstream-7.6](https://github.com/xcp-ng/xenadmin/tree/upstream-7.6) - [release/lima/master](https://github.com/xenserver/xenadmin/tree/release/lima/master) * [release-7.5](https://github.com/xcp-ng/xenadmin/tree/release-7.5) - [release/kolkata/master](https://github.com/xenserver/xenadmin/tree/release/kolkata/master) \ No newline at end of file