phpBB

Development Wiki

Difference between revisions of "Working with Git"

From phpBB Development Wiki

Redirect page
(Work flows: Pulling upstream changes)
(Redirected page to Git)
 
(40 intermediate revisions by 11 users not shown)
Line 1: Line 1:
= Basics =
+
#REDIRECT [[Git]]
 
+
== Cloning ==
+
Clone the master phpBB3 repository.
+
<pre>git clone git://github.com/phpbb/phpbb3.git</pre>
+
 
+
== 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 [http://github.com/phpbb/phpbb3] and then clone as instructed by GitHub.
+
 
+
== Configuration ==
+
* E-mail address: <pre>git config --add user.email username@phpbb.com</pre>
+
* Add the upstream remote (you can change 'upstream' to whatever you like): <pre>git remote add upstream git://github.com/phpbb/phpbb3.git</pre>
+
 
+
== Work flows ==
+
 
+
=== Pulling in upstream changes ===
+
You will need to merge in changes made to the upstream repository for them to appear in your fork, the steps to do this follow. I'm assuming you are performing this on the '''develop''' branch, but it could be a bug fix branch or a develop release branch, so ensure you are on the correct branch using git branch and change with git checkout if required.
+
 
+
# Pull the changes from the upstream '''develop''' branch: <pre>git pull upstream develop</pre>
+
# Push the changes back to your fork (substitute develop for the current branch): <pre>git push origin develop</pre>
+
 
+
=== Bug fixing ===
+
Ensure you are using the correct ''develop'' branch first and not a ''master'' branch.
+
 
+
# git branch bug/12345 # Create a new branch for your bug fix
+
# git checkout bug/12345 # Switch to the new branch
+
# Make your changes
+
# git add <files> # Stage the files
+
# git commit -m "Message" # Commit staged files
+
# git push origin bug/12345 # Push the branch back to github[/list]
+
 
+
[[Category:Development|Git]]
+
[[Category:Tutorials]]
+

Latest revision as of 14:04, 20 March 2012