Skip to content

Commit

Permalink
Update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
eduard-dumitru authored Jan 16, 2024
1 parent e85a079 commit 10aee05
Showing 1 changed file with 26 additions and 0 deletions.
26 changes: 26 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,32 @@ From time to time there is a need to merge the changes from the original repo in
| --- | --- |
|**Original corresponding commit hash:**| `d50aef95520df4216c638495a6049125c00742cb` |

## Update Guide

- consider the new Base Git Tag from the official repo onto which we'll rebase our changes

> **NOTE** For simplicity, let's consider `2.11.2` is the tag we want to rebase onto.
- sync our fork to include that Git Tag. On local, after cloning UiPath/FreeRdp, execute the following:

```pwsh
git fetch --tags --all # this will fetch all tags from all upstreams, including from FreeRdp/FreeRdp
git push --tags # this will push the new tags to UiPath/FreeRdp
```
- checkout the `uipath` branch
- ‼️ create a new branch to backup the current state (i.e. `support/before_update_to_2_11_2`)
- create **and checkout** a new branch that will be used as a work branch (i.e. `feat/update_to_2_11_2`)

- identify the Commit Hash, which is the parent of our 1st customization Commit

> **NOTE** At the time of writing, our 1st customization Commit's message's 1st line is `Add uipath changes from previous version (2.0.0-rc3)`
- Make sure you've checked out the work branch (i.e. `feat/update_to_2_11_2), and run **git rebase --onto**, so that all UiPath customization commits are replayed onto the new Base Git Tag:

```pwsh
git rebase --onto <NEW BASE Git Tag> <Our 1st customization Commit's Hash> <The work branch>
```


### Build instructions
* Visual Studio 2022 installed in `C:\Program Files` required.
Expand Down

0 comments on commit 10aee05

Please sign in to comment.