Community
Participate
Working Groups
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. Currently I have to go to the repository link, drill down on my project, checkout other branch, then merge. Better would be link from the git-status page to the git-clone page open on the branch I just pushed. Best would be if the git-status page offered checkout+merge for other branches just when I finished, ie when my list of unstaged/staged files was complete.
(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"