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: RomanNikitenko <rnikiten@redhat.com>
  • Loading branch information
RomanNikitenko committed Dec 7, 2024
1 parent 4ad93c7 commit 6896e95
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions .rebase/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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/463

- code/package.json
- code/test/automation/package.json
- code/test/smoke/package.json
---

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

Expand Down

0 comments on commit 6896e95

Please sign in to comment.