Bug 350601 - Support local branch merge workflow
Summary: Support local branch merge workflow
Status: RESOLVED WORKSFORME
Alias: None
Product: Orion (Archived)
Classification: ECD
Component: Git (show other bugs)
Version: 0.2   Edit
Hardware: PC Windows 7
: P3 enhancement (vote)
Target Milestone: 6.0 M2   Edit
Assignee: Maciej Bendkowski CLA
QA Contact:
URL:
Whiteboard:
Keywords: Documentation
Depends on:
Blocks:
 
Reported: 2011-06-28 11:23 EDT by Mark Macdonald CLA
Modified: 2014-04-29 05:44 EDT (History)
3 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Mark Macdonald CLA 2011-06-28 11:23:32 EDT 
My current Git workflow goes like this:

1. Create local branch for feature/bug work.
2. Work on local branch.
3. To stay up-to-date, periodically pull 'master' from remote, and rebase local branch against master.
(This step is not strictly required. I prefer it because it avoids a huge merge in step 4, and because rebase avoids noise from merge commits.)
4. When bug/feature is done, merge local branch into master.
5. Push master.
6. Delete local branch.

With our current Git support, I can't do Step 4.
Comment 1 libing wang CLA 2011-06-28 12:41:17 EDT 
+1 on this.
Also rebase might be nice to have as well. When I self host, every time when I merge from master I pushed back some noise.
Comment 2 Szymon Brandys CLA 2011-06-29 08:18:32 EDT 
(In reply to comment #0)
> With our current Git support, I can't do Step 4.

You can merge a local branch into the active one. There is no rebase though. I will look closer at this case.
Comment 3 libing wang CLA 2011-06-29 08:50:34 EDT 
(In reply to comment #2)

> You can merge a local branch into the active one. 
Indeed you can. I've tried this out. I lied to Mark.

When I saw the merge actions from both remote and local branches, I was thinking the one on the local performs the same action as the one on the remote as convenience.
We should mention this in wiki and make the tool tip clearer.
Comment 4 Szymon Brandys CLA 2011-07-07 08:01:09 EDT 
I'll clarify the doc. Also raised Bug 351429 for git rebase.
Comment 5 Maciej Bendkowski CLA 2014-04-29 05:40:14 EDT 
The local branch merge workflow is now fully supported. Regardless, the git wiki documentation is outdated and should be updated to Orion 6.0. I'll open a separate bug for that.