Remove the feeds module
This commit is contained in:
parent
acfd1cca8d
commit
0c98be96eb
851 changed files with 840 additions and 10348 deletions
|
@ -87,14 +87,5 @@
|
|||
"processed": "\n <p>Another question that followed my recent Git emails was, \" I assume you use rebase over merge?\"<\/p>\n\n<p>The short answer is \"yes\". I like to keep the history of my repositories clean and simple to read by keeping the logs linear and not full of merge commits.<\/p>\n\n<p>The longer answer is that I do merges, but only fast-forward merges, at least by default.<\/p>\n\n<p>If, when merging, Git can fast-forward my branch to the latest commit without creating a merge commit, it will do so.<\/p>\n\n<p>If not, I can then rebase my changes to make them linear and fast-forwardable. Alternatively, if the commits have already been pushed and cannot be overwritten, I can explicitly allow a non-fast-forward merge in that situation.<\/p>\n\n<p>I have Git configured to work this way as that's how I want it to work, and that configurability is something I like about Git.<\/p>\n\n<p>If you want to see how I have Git configured, my settings are in <a href=\"https:\/\/github.com\/opdavies\/dotfiles.nix\/blob\/462eff64f227332d58c7c3652eeaa88b692c064d\/lib\/shared\/modules\/git.nix#L95-L135\">my dotfiles repository<\/a> (note this file is written in the Nix language as I use Nix to manage my configuration).<\/p>\n\n<p>If you're working in a team, I'd suggest having a common configuration for everyone and defined rules for how you're going to use Git (branch names, merge or rebase, etc) to avoid inconsistencies.<\/p>\n\n ",
|
||||
"summary": null
|
||||
}
|
||||
],
|
||||
"feeds_item": [
|
||||
{
|
||||
"imported": "1970-01-01T00:32:50+00:00",
|
||||
"guid": null,
|
||||
"hash": "e5e300294005922421e456824c17e754",
|
||||
"target_type": "feeds_feed",
|
||||
"target_uuid": "90c85284-7ca8-4074-9178-97ff8384fe76"
|
||||
}
|
||||
]
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue