User login

Home ›
 branching

branching

Maintaining a Drupal project with Git: Vacating the master branch

Submitted by Benjamin Melançon on June 22, 2012 - 10:15am
in

If you've already been committing code to master, do this to start a new 7.x branch and kill off the code in the master branch so noone gets confused.

cd /path/to/repo
git checkout -b 7.x-1.x

git push origin 7.x-1.x

git checkout master
git rm -r *
echo "Real code is not kept on the master branch, to see the code: git checkout 7.x-1.x" > README.txt
git add README.txt
git commit -m "Add a README explaining that the master branch is empty."
git push origin master

Procedure for resolving a a left-behind branch that has merge conflicts

Submitted by Benjamin Melançon on August 29, 2011 - 3:28pm
in

DRAFT. Better methods from better minds invited!

Situation: Someone has been working away wonderfully on a git branch on your project. You do some crazy stuff with it over the weekend, and when they, on their continnum branch, go git pull --rebase origin continuum and get conflicts they don't know how to deal with, or when they go git fetch origin and git rebase master and have conflicts.

You want to take this off their hands.

Managing an SVN Repository

Submitted by Kathleen Murtagh on June 9, 2009 - 10:55pm
in

Although there is a SVN guide online, it'll probably be just easier to bring forward our more commonly infrequently used processes (and subsequently, easily forgotten). And while we're at it, discuss our conventions.

Tagging and Branching

Tags are not modified while branches can be modified as a working copy. The purpose of tags is to record a static snapshot of a point of code.

Release Procedure

Syndicate content