Skip to content

Commit 680333d

Browse files
committed
Add a sourcetree delete error to article
1 parent 7dca6cd commit 680333d

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed
19.5 KB
Loading

src/assets/state/articles/2.jsx

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { people } from "../team";
22
import tags from "./tags";
33

44
import thumbnail from "@blogImages/2/thumbnail.webp";
5+
import deleteError from "@blogImages/2/sourcetree-delete-error.webp";
56

67
import A from "@/components/pages/blog/post/ArticleComponents";
78

@@ -99,7 +100,29 @@ export default {
99100
</A.H2>
100101

101102
<p>
102-
Deleting branches is one of the standard features a Git client should have. One of the things we have noticed in already existing clients like SourceTree, is that they don't give errors as to why branch deletion fails. For example, if a branch is not merged yet it will throw a generic Git error, instead of telling you that the branch was not merged yet. We'll be taking notes from that and make sure that our error handling is descriptive and actually tells you what to do if something goes wrong.
103+
Deleting branches is one of the standard features a Git client should have. One of the things we have noticed in already existing clients like SourceTree, is that they don't give errors as to why branch deletion fails. For example, if a branch is not merged yet it will throw a generic Git error, instead of telling you that the branch was not merged yet.
104+
</p>
105+
106+
<A.Container className="gap-2">
107+
<A.Img
108+
className="max-w-3xl mx-auto"
109+
src={deleteError.src}
110+
width={deleteError.width}
111+
height={deleteError.height}
112+
alt="Very verbose SourceTree unmerged branch deletion error"
113+
aria-aria-labelledby="delete-error-note"
114+
/>
115+
<p
116+
id="delete-error-note"
117+
className="mx-auto text-center text-sm"
118+
role="note"
119+
>
120+
A SourceTree error when deleting an unmerged branch without Force delete enabled
121+
</p>
122+
</A.Container>
123+
124+
<p>
125+
We'll be taking notes from that and make sure that our error handling is descriptive and actually tells you what to do if something goes wrong.
103126
</p>
104127

105128
<A.H2>

0 commit comments

Comments
 (0)