[PHPBB3-9806] Script for easy merging - phpBB Tracker

XML

Word

Printable

Details

Type: Task
Status: Unverified Fix (View Workflow)
Priority: Minor
Resolution: Fixed
Affects Version/s: 3.0.7-PL1
Fix Version/s: 3.0.9-RC1
Component/s: None
Labels:
None

GitHub Pull Request URL:
http://github.com/evil3/phpbb3/compare/ticket%2F9806
Fix URL:
https://github.com/phpbb/phpbb3/pull/130

Description

Merging should be as easy as:

merge-ticket.sh 1234 evil3 develop-olympus

This should:

git remote update
git branch ticket/evil3/1234 evil3/ticket/1234
git checkout develop-olympus
git merge --no-ff evil3/ticket/1234

Attachments

Activity

People

Assignee:: Igor Wiedler [X] (Inactive)

Reporter:: Igor Wiedler [X] (Inactive)

Votes:: 0 Vote for this issue

Watchers:: 0 Start watching this issue

Dates

Created:: 07/Sep/10 4:50 PM

Updated:: 20/Mar/11 9:32 PM

Resolved:: 12/Mar/11 11:57 PM