Skip to content

Commit

Permalink
chore: Add info related to rebasing against upstream
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Nikitenko <[email protected]>

rh-pre-commit.version: 2.2.0
rh-pre-commit.check-secrets: ENABLED
  • Loading branch information
RomanNikitenko committed Jan 17, 2025
1 parent 05df9bc commit 9a6544b
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions .rebase/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

The file to keep a list of changed files which will potentionaly help to resolve rebase conflicts.

#### @RomanNikitenko
https://github.com/che-incubator/che-code/pull/485

- code/package.json
- code/remote/package.json
---

#### @RomanNikitenko
https://github.com/che-incubator/che-code/pull/482

Expand Down

0 comments on commit 9a6544b

Please sign in to comment.