Skip to content

Commit

Permalink
add warning to do rebase only for one contributor per branch
Browse files Browse the repository at this point in the history
  • Loading branch information
Andree Valle Campos authored and avallecam committed Dec 19, 2023
1 parent 1998fd0 commit 9df13a4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,9 @@ If you need the version of a package that is not programmatically loaded, i.e.,
To merge your new episodes:

- Make a Pull request (PR). You can follow the stesp on [using GitHub](#using-github).
- Keep branches up to date with `main`.
- Keep your feature branch up to date with `main`.
- This encourage to keep the history as linear as possible, prioritizing actions like ["rebase and merge"](https://epiverse-trace.github.io/blueprints/git-branching-merging.html#merging-pull-requests-merge-commits-vs-squash-and-merge-vs-rebase-and-merge) to accept the PR.
- In the local repository, follow all these five steps:
- In the local repository. First, make sure that you are the only contributor in the `feature` branch. Then, follow all these five steps:
1. Switch to the `main` branch: `git checkout main`
2. Pull the `main` branch: `git pull`
3. Switch to your `feature` branch: `git checkout feature`
Expand Down

0 comments on commit 9df13a4

Please sign in to comment.