phpBB

Development Wiki

Difference between revisions of "Working with Git"

From phpBB Development Wiki

(Categorise)
(Grr)
Line 2: Line 2:
  
 
== Cloning ==
 
== Cloning ==
 
+
Clone the master phpBB3 repository.
 
<pre>git clone git://github.com/phpbb/phpbb3.git</pre>
 
<pre>git clone git://github.com/phpbb/phpbb3.git</pre>
  

Revision as of 20:49, 2 March 2010

Basics

Cloning

Clone the master phpBB3 repository.

git clone git://github.com/phpbb/phpbb3.git

Branches

  • master: Mainline for releases
  • develop: Development branch for the next feature release
  • develop-olympus: Development branch of named release

Developers

Developers should fork a copy of the repository on GitHub from [1] and then clone as instructed by GitHub.

Configuration

  • E-mail address:
    git config --add user.email username@phpbb.com

Work flows

Bug fixing

Ensure you are using the correct develop branch first and not a master branch.

  1. git branch bug/12345 # Create a new branch for your bug fix
  2. git checkout bug/12345 # Switch to the new branch
  3. Make your changes
  4. git add <files> # Stage the files
  5. git commit -m "Message" # Commit staged files
  6. git push origin bug/12345 # Push the branch back to github[/list]