Skip to content

Commit 3aa5e0e

Browse files
committed
2 parents 018c88e + 61471ca commit 3aa5e0e

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Laravel + React Starter Kit
1+
# Laravel + React Starter Kit - v0.0.1
22

33
[Shoaib Khan](https://github.com/iamspydey) from [Devs Buddy](https://devsbuddy.com) presenting you a highly opinionated Laravel Starter Kit with Inertia and React. It helps you get up and running quickly with clean, consistent, and fully type-safe code.
44

UPDATING.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
You can update your project from the starter-kit (merge a tagged release)
44

5-
This guide explains a safe, repeatable workflow for fetching a specific **tagged release** from the starter-kit (for example `v0.1.0` - Latest) and merging it into your project.
5+
This guide explains a safe, repeatable workflow for fetching a specific **tagged release** from the starter-kit (for example `v0.0.1` - Latest) and merging it into your project.
66

77
**Assumption:** you started your project from the starter-kit and added the starter-kit repo as the `upstream` remote:
88

@@ -50,7 +50,7 @@ git fetch upstream --tags
5050
2. Verify the tag exists locally:
5151

5252
```bash
53-
git tag --list | grep v0.1.0
53+
git tag --list | grep v0.0.1
5454
```
5555

5656
3. Ensure you are on your local `main` (or your app's primary branch):
@@ -63,7 +63,7 @@ git pull origin main
6363
4. Merge the tag into `main`:
6464

6565
```bash
66-
git merge --no-ff v0.1.0 -m "Merge upstream v0.1.0"
66+
git merge --no-ff v0.0.1 -m "Merge upstream v0.0.1"
6767
```
6868

6969
- If Git performs a fast-forward merge it will simply move your branch pointer.
@@ -88,13 +88,13 @@ git fetch upstream --tags
8888
```bash
8989
git checkout main
9090
git pull origin main
91-
git checkout -b upstream-merge-v0.1.0
91+
git checkout -b upstream-merge-v0.0.1
9292
```
9393

9494
3. Merge the tag into the temporary branch:
9595

9696
```bash
97-
git merge --no-ff v0.1.0 -m "Merge upstream v0.1.0 (test)"
97+
git merge --no-ff v0.0.1 -m "Merge upstream v0.0.1 (test)"
9898
```
9999

100100
4. Resolve conflicts if any (see below). Run your tests and local checks.
@@ -103,16 +103,16 @@ git merge --no-ff v0.1.0 -m "Merge upstream v0.1.0 (test)"
103103

104104
```bash
105105
git checkout main
106-
git merge --no-ff upstream-merge-v0.1.0 -m "Apply upstream v0.1.0 merge"
106+
git merge --no-ff upstream-merge-v0.0.1 -m "Apply upstream v0.0.1 merge"
107107
git push origin main
108108
```
109109

110110
6. Delete the temporary branch locally and remotely (optional):
111111

112112
```bash
113-
git branch -d upstream-merge-v0.1.0
113+
git branch -d upstream-merge-v0.0.1
114114
# if you pushed it upstream and want to delete on remote:
115-
# git push origin --delete upstream-merge-v0.1.0
115+
# git push origin --delete upstream-merge-v0.0.1
116116
```
117117

118118
---
@@ -193,16 +193,16 @@ git fetch upstream --tags
193193

194194
# 2. Test-first approach
195195
git checkout main && git pull origin main
196-
git checkout -b upstream-merge-v0.1.0
197-
git merge --no-ff v0.1.0 -m "Merge upstream v0.1.0 (test)"
196+
git checkout -b upstream-merge-v0.0.1
197+
git merge --no-ff v0.0.1 -m "Merge upstream v0.0.1 (test)"
198198
# resolve conflicts, run tests, then
199199
git checkout main
200-
git merge --no-ff upstream-merge-v0.1.0
200+
git merge --no-ff upstream-merge-v0.0.1
201201
git push origin main
202202

203203
# 3. Direct merge approach
204204
git checkout main && git pull origin main
205-
git merge --no-ff v0.1.0 -m "Merge upstream v0.1.0"
205+
git merge --no-ff v0.0.1 -m "Merge upstream v0.0.1"
206206
# resolve conflicts, run post-merge tasks, then
207207
git push origin main
208208
```

0 commit comments

Comments
 (0)