I have the following scenario:

1. Created new branch `branch1` from `master`
2. In `branch1`, I added a new file called `b1.txt` + also in `common.txt` I added new line `echo 'line added in branch1';`.
3. Created new branch `branch2` from `branch1`
4. Renamed the file `b1.txt` to `b2.txt` + also in `common.txt` I changed that line to `echo 'line added in branch2';`.
5. Merged `branch1` into `master`
6. Merged `branch2` into `master`

**Result**: `master` has 1 new file `b2.txt`, and new line in `common.txt` that reads `echo 'line added in branch2';`.

**What I'd like to get as result:** `master` has 2 new files `b1.txt` and `b2.txt`, and 2 new lines in `common.txt` that reads `echo 'line added in branch1';` and `echo 'line added in branch2';`.

**How to achieve this?**

**Note:** I know, normally, I should create `branch2` from `master`, but It's much easier to copy-paste (and slightly modify) the changes of `branch1`, although `branch1` is not yet merged into `master`.