Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a97bfd9744b8
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16d12f82d725
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 21, 2021

  1. Document the catch-up process.

    pleroy committed May 21, 2021
    Copy the full SHA
    7a83a39 View commit details
  2. Markdown.

    pleroy committed May 21, 2021
    Copy the full SHA
    29cc179 View commit details
  3. Merge pull request #2991 from pleroy/Ketchup

    Document the catch-up process
    eggrobin authored May 21, 2021
    Copy the full SHA
    16d12f8 View commit details
Showing with 33 additions and 0 deletions.
  1. +33 −0 documentation/Catching Up.md
33 changes: 33 additions & 0 deletions documentation/Catching Up.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Instructions for catching-up dependents

- [ ] Create a tag for the current master.
- [ ] Create a new branch for the catch-up:
```powershell
git checkout master
git checkout -b Ketchup
```
- [ ] Move master to the last commit at the time of the previous catch-up (the
one on which we applied our changes):
```powershell
git checkout master
git reset --hard <commit>
```
- [ ] Pull the changes made to google/master:
```powershell
git pull google master
```
- [ ] Redo our changes on top of google/master:
```powershell
git checkout Ketchup
git rebase master
```
- [ ] Update our master
```powershell
git checkout master
git merge Ketchup
git push -f
```
- [ ] Cleanup and squash some of the commits.
```powershell
git branch -d Ketchup
```