opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

tome export

Browse source
This commit is contained in:
Oliver Davies 2025-05-30 02:14:32 +01:00
parent 52278c3a53
commit 7a52afab5f
960 changed files with 3670 additions and 2229 deletions
Download patch file Download diff file Expand all files Collapse all files

6
content/node.2885a415-17fb-4374-8070-0be55407af6c.json
View file

@ -82,15 +82,15 @@
],
"body": [
{
"value": "\n <p>Since I posted about <a href=\"/daily\/2024\/05\/10\/optimise-for-revertability\">optimising for revertability<\/a>, I've received a few questions about how I avoid merge commits when working with Git.<\/p>\n\n<p>This is an extract from my <code>.config\/git\/.config<\/code> file:<\/p>\n\n<pre><code class=\"ini\">[merge]\n ff = \"only\"\n\n[pull]\n ff = \"only\"\n rebase = true\n<\/code><\/pre>\n\n<p>This changes the behaviour of when I run <code>git pull<\/code> to always include <code>--rebase<\/code> by default and to only allow fast-forward merges and pulls.<\/p>\n\n<p>Only allowing fast-forward merges avoids merge commits as Git can just move the pointer for the branch to the latest commit.<\/p>\n\n<p>If I can't do a fast-forward merge, I need to rebase first to update everything and bring it up to date.<\/p>\n\n<p>Sometimes, when working in team, merge commits will still creep in sometimes and there are situations where you can only create a merge commit.<\/p>\n\n<p>In this situation, I can do <code>git merge --ff<\/code> to allow a merge commit temporarily, but this is the exception instead of the default.<\/p>\n\n<blockquote>\n <p>Hint: there's a lot more information on the configuration and arguments if you run and read <code>man git-merge<\/code>.<\/p>\n<\/blockquote>\n\n<p>When working with online tools such as GitHub and GitLab, I avoid any options like <code>Squash and merge<\/code> or <code>Create a merge commit<\/code> and will use rebase options, although I've seen where different commit IDs have been generated when merged in the UI, which is why I prefer to do merges locally.<\/p>\n\n<p>Or use <a href=\"/daily\/2023\/06\/17\/avoid-git-merge-hell-with-trunk-based-development\">trunk-based development<\/a> and don't work on topic branches at all.<\/p>\n\n ",
"value": "\n <p>Since I posted about <a href=\"\/daily\/2024\/05\/10\/optimise-for-revertability\">optimising for revertability<\/a>, I've received a few questions about how I avoid merge commits when working with Git.<\/p>\n\n<p>This is an extract from my <code>.config\/git\/.config<\/code> file:<\/p>\n\n<pre><code class=\"ini\">[merge]\n ff = \"only\"\n\n[pull]\n ff = \"only\"\n rebase = true\n<\/code><\/pre>\n\n<p>This changes the behaviour of when I run <code>git pull<\/code> to always include <code>--rebase<\/code> by default and to only allow fast-forward merges and pulls.<\/p>\n\n<p>Only allowing fast-forward merges avoids merge commits as Git can just move the pointer for the branch to the latest commit.<\/p>\n\n<p>If I can't do a fast-forward merge, I need to rebase first to update everything and bring it up to date.<\/p>\n\n<p>Sometimes, when working in team, merge commits will still creep in sometimes and there are situations where you can only create a merge commit.<\/p>\n\n<p>In this situation, I can do <code>git merge --ff<\/code> to allow a merge commit temporarily, but this is the exception instead of the default.<\/p>\n\n<blockquote>\n <p>Hint: there's a lot more information on the configuration and arguments if you run and read <code>man git-merge<\/code>.<\/p>\n<\/blockquote>\n\n<p>When working with online tools such as GitHub and GitLab, I avoid any options like <code>Squash and merge<\/code> or <code>Create a merge commit<\/code> and will use rebase options, although I've seen where different commit IDs have been generated when merged in the UI, which is why I prefer to do merges locally.<\/p>\n\n<p>Or use <a href=\"\/daily\/2023\/06\/17\/avoid-git-merge-hell-with-trunk-based-development\">trunk-based development<\/a> and don't work on topic branches at all.<\/p>\n\n ",
"format": "full_html",
"processed": "\n <p>Since I posted about <a href=\"/daily\/2024\/05\/10\/optimise-for-revertability\">optimising for revertability<\/a>, I've received a few questions about how I avoid merge commits when working with Git.<\/p>\n\n<p>This is an extract from my <code>.config\/git\/.config<\/code> file:<\/p>\n\n<pre><code class=\"ini\">[merge]\n ff = \"only\"\n\n[pull]\n ff = \"only\"\n rebase = true\n<\/code><\/pre>\n\n<p>This changes the behaviour of when I run <code>git pull<\/code> to always include <code>--rebase<\/code> by default and to only allow fast-forward merges and pulls.<\/p>\n\n<p>Only allowing fast-forward merges avoids merge commits as Git can just move the pointer for the branch to the latest commit.<\/p>\n\n<p>If I can't do a fast-forward merge, I need to rebase first to update everything and bring it up to date.<\/p>\n\n<p>Sometimes, when working in team, merge commits will still creep in sometimes and there are situations where you can only create a merge commit.<\/p>\n\n<p>In this situation, I can do <code>git merge --ff<\/code> to allow a merge commit temporarily, but this is the exception instead of the default.<\/p>\n\n<blockquote>\n <p>Hint: there's a lot more information on the configuration and arguments if you run and read <code>man git-merge<\/code>.<\/p>\n<\/blockquote>\n\n<p>When working with online tools such as GitHub and GitLab, I avoid any options like <code>Squash and merge<\/code> or <code>Create a merge commit<\/code> and will use rebase options, although I've seen where different commit IDs have been generated when merged in the UI, which is why I prefer to do merges locally.<\/p>\n\n<p>Or use <a href=\"/daily\/2023\/06\/17\/avoid-git-merge-hell-with-trunk-based-development\">trunk-based development<\/a> and don't work on topic branches at all.<\/p>\n\n ",
"processed": "\n <p>Since I posted about <a href=\"http:\/\/default\/daily\/2024\/05\/10\/optimise-for-revertability\">optimising for revertability<\/a>, I've received a few questions about how I avoid merge commits when working with Git.<\/p>\n\n<p>This is an extract from my <code>.config\/git\/.config<\/code> file:<\/p>\n\n<pre><code class=\"ini\">[merge]\n ff = \"only\"\n\n[pull]\n ff = \"only\"\n rebase = true\n<\/code><\/pre>\n\n<p>This changes the behaviour of when I run <code>git pull<\/code> to always include <code>--rebase<\/code> by default and to only allow fast-forward merges and pulls.<\/p>\n\n<p>Only allowing fast-forward merges avoids merge commits as Git can just move the pointer for the branch to the latest commit.<\/p>\n\n<p>If I can't do a fast-forward merge, I need to rebase first to update everything and bring it up to date.<\/p>\n\n<p>Sometimes, when working in team, merge commits will still creep in sometimes and there are situations where you can only create a merge commit.<\/p>\n\n<p>In this situation, I can do <code>git merge --ff<\/code> to allow a merge commit temporarily, but this is the exception instead of the default.<\/p>\n\n<blockquote>\n <p>Hint: there's a lot more information on the configuration and arguments if you run and read <code>man git-merge<\/code>.<\/p>\n<\/blockquote>\n\n<p>When working with online tools such as GitHub and GitLab, I avoid any options like <code>Squash and merge<\/code> or <code>Create a merge commit<\/code> and will use rebase options, although I've seen where different commit IDs have been generated when merged in the UI, which is why I prefer to do merges locally.<\/p>\n\n<p>Or use <a href=\"http:\/\/default\/daily\/2023\/06\/17\/avoid-git-merge-hell-with-trunk-based-development\">trunk-based development<\/a> and don't work on topic branches at all.<\/p>\n\n ",
"summary": null
}
],
"feeds_item": [
{
"imported": "1970-01-01T00:33:45+00:00",
"imported": "1970-01-01T00:32:50+00:00",
"guid": null,
"hash": "df04ab02769a8e43f0227ca122c3d48c",
"target_type": "feeds_feed",