| Summary: | [client][status] Link from git-status to git-clone | ||
|---|---|---|---|
| Product: | [ECD] Orion | Reporter: | John J. Barton <johnjbarton> |
| Component: | Git | Assignee: | Susan McCourt <susan> |
| Status: | RESOLVED FIXED | QA Contact: | |
| Severity: | normal | ||
| Priority: | P3 | CC: | libingw, Szymon.Brandys, tomasz.zarna |
| Version: | unspecified | ||
| Target Milestone: | 0.4 RC1 | ||
| Hardware: | PC | ||
| OS: | Windows 7 | ||
| Whiteboard: | |||
|
Description
John J. Barton
(In reply to comment #0) > Often as soon as I commit and push, I want to merge then switch back to my dev > branch. I believe this a common workflow. Just to clear up, is that what would you do in the console (assuming you're on master)? git commit ...; git push origin master:master; git merge dev; git checkout dev What are the changes you have just pushed? Are they merged from the dev branch? What I usually do with my opened dev branches, is after I pushed some changes I rebase all of them (with master). Have you tried that? I may be able to solve this generically with "related pages" fixed with a new command "go to repository" in the git plugin. Then a "related links" contribution for the command. This surfaces in several ways: - the "related pages" menu contains "Repository" when you are a Git Status page (the original request), Git Log page, or the navigator (if the nav root is in a git repo) - also, from the nav objects you can select a folder and choose "Git Repository" |