diff --git a/pages/blog/pulls.md b/pages/blog/pulls.md index 84e2490..5eed569 100644 --- a/pages/blog/pulls.md +++ b/pages/blog/pulls.md @@ -4,7 +4,8 @@ template: slug: pulls title: the lifecycle of a pull request subtitle: we shipped a bunch of PR features recently; here's how we built it -date: 2025-04-15 +date: 2025-04-16 +image: /static/img/hidden-ref.png authors: - name: Anirudh email: anirudh@tangled.sh @@ -43,7 +44,8 @@ target branch. Consider this scenario:
-
Merge base caption here! [!!!change this!]
+
A is the merge-base for +feature and main.
Your `feature` branch has advanced 2 commits since you first @@ -51,8 +53,8 @@ branched out, but in the meanwhile, `main` has also advanced 2 commits. Doing a trivial `git diff feature main` will produce a confusing patch: -- the patch will apply the changes from X and Y -- the patch will **revert** the changes from B and C +- the patch will apply the changes from `X` and `Y` +- the patch will **revert** the changes from `B` and `C` We obviously do not want the second part! To only show the changes added by `feature`, we have to identify the @@ -67,8 +69,8 @@ subsequently, the patch calculated will contain just `X` and ### ref comparisons across forks The plumbing described above is easy to do across two -branches, but what about forks? and what if they live on -different servers altogether (as they can in tangled!)? +branches, but what about forks? And what if they live on +different servers altogether (as they can in Tangled!)? Here's the concept: since we already have all the necessary components to compare two local refs, why not simply @@ -172,5 +174,9 @@ future plans for pull requests: * Change ID support: This will allow us to group changes together and track them across multiple commits, and to - provide "history" for each change. This works great with - `jujutsu`. + provide "history" for each change. This works great with [Jujutsu][jj]. + +Oh and lastly, we have a [Discord](https://discord.gg/W7SRR4xHhd). We'll +see you there! + +[jj]: https://jj-vcs.github.io/jj/latest/ diff --git a/templates/partials/head.html b/templates/partials/head.html index bffc512..9a2707f 100644 --- a/templates/partials/head.html +++ b/templates/partials/head.html @@ -3,10 +3,6 @@ - - - - diff --git a/templates/partials/nav.html b/templates/partials/nav.html index 8c17886..2a0699d 100644 --- a/templates/partials/nav.html +++ b/templates/partials/nav.html @@ -1,7 +1,11 @@ diff --git a/templates/text.html b/templates/text.html index acc52e0..ad5301b 100644 --- a/templates/text.html +++ b/templates/text.html @@ -3,6 +3,11 @@ {{ template "partials/head.html" . }} + + + + + {{ index .Meta "title" }}