git https://www.tag1consulting.com/term/git en git rebase --onto - The Simple One-Minute Explanation https://www.tag1consulting.com/blog/git-rebase-simple-one-minute-explanation <div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">TL;DR the command you want is: git rebase --onto [the new HEAD base] [the old head base - check git log] [the-branch-to-rebase-from-one-base-to-another] And my main motivation to putting it here is to easily find it again in the future as I always forget the syntax. (This is a re-post from my old blog on drupalgardens, but it is still helpful.) Mental model To make all of this simpler think of: You have: Two red dishes on top of two blue dishes One yellow dish You want: Those two red dishes on top of the one yellow dish You do: Carefully go with the finger down to the bottom of the two red dishes, which is the first blue dish Take the two red dishes Transfer them over to the one yellow dish That is what rebase --onto does: git rebase --onto [yellow dish] [from: first blue dish] [the two red dishes] Note: The following is meant for an intermediate audience that is familiar with general rebasing in GIT Longer explanation It happened! A branch - you had based your work - on has diverged upstream, but you still have work in progress, which you want to preserve. So it looks... <div class="more-link"><a href="/blog/git-rebase-simple-one-minute-explanation" class="more-link" hreflang="en">Read more</a></div></div> <span><span lang="" about="/user/fabian-franz" typeof="schema:Person" property="schema:name" datatype="">fabian</span></span> <span>Tue, 04/17/2018 - 02:24</span> Tue, 17 Apr 2018 09:24:44 +0000 fabian 92 at https://www.tag1consulting.com Nedjo Rogers https://www.tag1consulting.com/blog/nedjo-rogers <div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">Nedjo Rogers is a Senior Performance Engineer with Tag1 based out of Victoria, Canada. He’s been an active Drupal contributor since 2003, has served as an advisory board member of the Drupal Association, and has led Drupal development projects for clients including Sony Music, the Smithsonian Institute, the Linux Foundation, and a number of nonprofit organizations. He’s also the co-founder of Chocolate Lily, where he builds web tools for nonprofits, including the Drupal distribution Open Outreach.<div class="more-link"><a href="/blog/nedjo-rogers" class="more-link" hreflang="en">Read more</a></div></div> <span><span lang="" about="/user/dylan-clear" typeof="schema:Person" property="schema:name" datatype="">Dylan Clear</span></span> <span>Wed, 04/22/2015 - 10:24</span> Wed, 22 Apr 2015 17:24:55 +0000 Dylan Clear 53 at https://www.tag1consulting.com How to Maintain Contrib Modules for Drupal and Backdrop at the Same Time - Part 3 https://www.tag1consulting.com/blog/how-maintain-contrib-modules-drupal-and-backdrop-same-time-part-3 <div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">This is the third in a series of blog posts about the relationship between Drupal and Backdrop CMS , a recently-released fork of Drupal. The goal of the series is to explain how a module (or theme) developer can take a Drupal project they currently maintain and support it for Backdrop as well, while keeping duplicate work to a minimum. In part 1 , I introduced the series and showed how for some modules, the exact same code can be used with both Drupal and Backdrop. In part 2 , I showed what to do when you want to port a Drupal module to a separate Backdrop version and get it up and running on GitHub. In part 3 (this post), I'll wrap up the series by explaining how to link the Backdrop module to the Drupal.org version and maintain them simultaneously. Linking the Backdrop Module to the Drupal.org Version and Maintaining Them Simultaneously In part 2 I took a small Drupal module that I maintain ( User Cancel Password Confirm ) and ported it to Backdrop. In the end, I wound up with two codebases for the same module, one on Drupal.org for Drupal 7, and one on GitHub... <div class="more-link"><a href="/blog/how-maintain-contrib-modules-drupal-and-backdrop-same-time-part-3" class="more-link" hreflang="en">Read more</a></div></div> <span><span lang="" about="/user/david-rothstein" typeof="schema:Person" property="schema:name" datatype="">david</span></span> <span>Thu, 02/26/2015 - 06:54</span> Thu, 26 Feb 2015 14:54:26 +0000 david 58 at https://www.tag1consulting.com How to Maintain Contrib Modules for Drupal and Backdrop at the Same Time - Part 2 https://www.tag1consulting.com/blog/how-maintain-contrib-modules-drupal-and-backdrop-same-time-part-2 <div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">This is the second in a series of blog posts about the relationship between Drupal and Backdrop CMS , a recently-released fork of Drupal. The goal of the series is to explain how a module (or theme) developer can take a Drupal project they currently maintain and support it for Backdrop as well, while keeping duplicate work to a minimum. In part 1 , I introduced the series and showed how for some modules, the exact same code can be used with both Drupal and Backdrop. In part 2 (this post), I'll explain what to do when you want to port a Drupal module to a separate Backdrop version and get it up and running on GitHub. In part 3 , I'll explain how to link the Backdrop module to the Drupal.org version and maintain them simultaneously. Porting a Drupal Module to Backdrop and Getting it Up and Running on GitHub For this post I’ll be looking at User Cancel Password Confirm , a very small Drupal 7 module I wrote for a client a couple years back to allow users who are canceling their accounts to confirm the cancellation by typing in their password rather than having to go... <div class="more-link"><a href="/blog/how-maintain-contrib-modules-drupal-and-backdrop-same-time-part-2" class="more-link" hreflang="en">Read more</a></div></div> <span><span lang="" about="/user/david-rothstein" typeof="schema:Person" property="schema:name" datatype="">david</span></span> <span>Tue, 02/17/2015 - 08:00</span> Tue, 17 Feb 2015 16:00:00 +0000 david 57 at https://www.tag1consulting.com Chapter 1 Rough Draft Complete https://www.tag1consulting.com/blog/chapter-1-rough-draft-complete <div class="field field--name-body field--type-text-with-summary field--label-hidden field--item">I have completed a rough draft of the first chapter of " Drupal Performance and Scalability ". The first chapter of this online book is divided into four sections, the first of which focuses on the importance of fully defining your performance and scalability goals, helping you to identify what you need to accomplish and how to set concrete and attainable goals. The second section discusses monitoring and measuring your ongoing progress, helping you decide what you need to monitor, and how to monitor it. The third section stresses the importance of making regular backups, discussing what needs to be backed up, and offering example scripts for backing up your entire website, including the database. Finally, the fourth section takes an in depth look at using revision control tools to manage your website, providing useful recipes showing how Git can track changes to your website, helping you update to new releases and push those updates into production. It is important to realize that this is a rough draft, and as such it may contain spelling or grammatical errors, it may be missing key points, and the writing style may not be very polished. However, the book has to start somewhere,... <div class="more-link"><a href="/blog/chapter-1-rough-draft-complete" class="more-link" hreflang="en">Read more</a></div></div> <span><span lang="" about="/user/jeremy-andrews" typeof="schema:Person" property="schema:name" datatype="">Jeremy</span></span> <span>Sun, 07/27/2008 - 20:27</span> Mon, 28 Jul 2008 03:27:07 +0000 Jeremy 15 at https://www.tag1consulting.com