Skip to content

Commit

Permalink
switch references from BAR105 branch to master
Browse files Browse the repository at this point in the history
  • Loading branch information
n-morales authored and lhog committed Oct 20, 2024
1 parent e69f380 commit 728f1a3
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

### Get the engine sources

git clone https://github.com/beyond-all-reason/spring -b BAR105 --recursive
git clone https://github.com/beyond-all-reason/spring --recursive

Recoil is a fork and continuation of an RTS [engine](https://github.com/spring/spring) version 105.0

Expand All @@ -19,7 +19,7 @@ You can use a pre-compiled binary, usually, you want to use an installer or a pa

Detailed instructions for how to compile Recoil can be found [here](https://github.com/beyond-all-reason/spring/wiki/Building-and-developing-engine-without-docker) or [here](https://github.com/beyond-all-reason/spring/wiki/SpringRTS-Build-Environment-(Docker))

Use `BAR105` as the primary branch.
Use `master` as the primary branch.

Verify you're seeing tags:

Expand All @@ -41,10 +41,11 @@ git remote add upstream [email protected]:beyond-all-reason/spring.git
git fetch --all --tags
```

Check out the BAR105 branch in this case:
Make sure `master` is pointing to upstream `master`:

```bash
git checkout upstream/BAR105 -b BAR105
git checkout master
git branch -u upstream/master
```

The most simple set of commands will be:
Expand Down

0 comments on commit 728f1a3

Please sign in to comment.