From d68bf61ca980a429a9d48d7f2438eff5ed975e73 Mon Sep 17 00:00:00 2001 From: Alexander Molchevsky Date: Mon, 27 Feb 2023 17:55:35 +0200 Subject: [PATCH 1/4] Added a description of how to back port changes to old versions --- process/how_to_backport_changes.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 process/how_to_backport_changes.md diff --git a/process/how_to_backport_changes.md b/process/how_to_backport_changes.md new file mode 100644 index 0000000..71ec8ec --- /dev/null +++ b/process/how_to_backport_changes.md @@ -0,0 +1,19 @@ +### The process of back port changes to old release branches is as follows: + +- Create a branch with the changes + +- Create a PR into `release/3.1` from that branch + + - Once approved, merge into `release/3.1` + +- Create a branch that merges `release/3.1` into `release/3.2` + +- Create a PR into `release/3.2` from that branch + + - Once approved, merge into release/3.2 + +- Create a branch that merges release/3.2 into main + +- Create a PR into main from that branch + + - Once approved, merge into main \ No newline at end of file From 8d42ee0fd9532c6988dd78d523fdde0f379b6930 Mon Sep 17 00:00:00 2001 From: Alexander Molchevsky Date: Mon, 27 Feb 2023 22:45:46 +0200 Subject: [PATCH 2/4] Updated the description of how to back port changes to old versions --- process/how_to_backport_changes.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/process/how_to_backport_changes.md b/process/how_to_backport_changes.md index 71ec8ec..bb5ff99 100644 --- a/process/how_to_backport_changes.md +++ b/process/how_to_backport_changes.md @@ -1,5 +1,15 @@ ### The process of back port changes to old release branches is as follows: +In order to back port changes to the old release branches you need to create your own branch, +push your changes to this branch, create a pull request with your changes and, when it will be approved, +merge your changes into the oldest release branch which you want to change. + +Then you should create a branch that merges the previous release branch into the next release branch, +create a pull request and approve it. An do the same for each branch till the `main` branch. + +For example let's say we need to back port changes to project `leap` which has two release branches `release/3.1` +and `release/3.2` and a `main` branch. Here is what we should do: + - Create a branch with the changes - Create a PR into `release/3.1` from that branch @@ -10,10 +20,10 @@ - Create a PR into `release/3.2` from that branch - - Once approved, merge into release/3.2 + - Once approved, merge into `release/3.2` -- Create a branch that merges release/3.2 into main +- Create a branch that merges `release/3.2` into main -- Create a PR into main from that branch +- Create a PR into `main` from that branch - - Once approved, merge into main \ No newline at end of file + - Once approved, merge into `main` \ No newline at end of file From daf4ce673146645c91a62f72bb94fcc090b1878e Mon Sep 17 00:00:00 2001 From: Alexander Molchevsky Date: Mon, 27 Feb 2023 22:51:49 +0200 Subject: [PATCH 3/4] Update how_to_backport_changes.md Several errata corrected. --- process/how_to_backport_changes.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/process/how_to_backport_changes.md b/process/how_to_backport_changes.md index bb5ff99..4042dee 100644 --- a/process/how_to_backport_changes.md +++ b/process/how_to_backport_changes.md @@ -5,10 +5,10 @@ push your changes to this branch, create a pull request with your changes and, w merge your changes into the oldest release branch which you want to change. Then you should create a branch that merges the previous release branch into the next release branch, -create a pull request and approve it. An do the same for each branch till the `main` branch. +create a pull request and approve it. And do the same for each branch till the `main` branch. -For example let's say we need to back port changes to project `leap` which has two release branches `release/3.1` -and `release/3.2` and a `main` branch. Here is what we should do: +For example let's say we need to back port changes to project `leap` which has two release branches `release/3.1`, +`release/3.2` and a `main` branch. Here is what we should do: - Create a branch with the changes @@ -26,4 +26,4 @@ and `release/3.2` and a `main` branch. Here is what we should do: - Create a PR into `main` from that branch - - Once approved, merge into `main` \ No newline at end of file + - Once approved, merge into `main` From 4c0827209e1d52c79e6e42c95472241526f0a40b Mon Sep 17 00:00:00 2001 From: Alexander Molchevsky Date: Wed, 26 Apr 2023 17:25:00 +0300 Subject: [PATCH 4/4] Added a newline at end of the file --- process/how_to_backport_changes.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/process/how_to_backport_changes.md b/process/how_to_backport_changes.md index bb5ff99..19e6f3e 100644 --- a/process/how_to_backport_changes.md +++ b/process/how_to_backport_changes.md @@ -26,4 +26,6 @@ and `release/3.2` and a `main` branch. Here is what we should do: - Create a PR into `main` from that branch - - Once approved, merge into `main` \ No newline at end of file + - Once approved, merge into `main` + +