+2
Fast forward merge: support for multiple branches
Please add a way to quickly fast-forward merge multiple branches.
In the "branches" view, if I have multiple branches selected, I would like to be able to right click -> fast-forward merge.
If I right click on "local branches", "origin", or similar, I would like to be able to fast-forward merge them all.
My reason for this is when I like to keep a separate clone that doesn't have any of my local changes in it. I use this to do merging operations that my have conflicts with my current working tree. Or to have a clean copy to run comparisons with. However, this gets out of sync with the upstream frequently since I'm not active in it.
Customer support service by UserEcho
This would also ease our daily work a little bit. We have different release branches, which we maintain. So it would mean a little more comfort in daily development. Would be really nice to have.
Just for the records: the Standard-window fast-forwards all tracking branches on Pull. Do you want to get this behavior (optionally) for the Working Tree or Log window, too?
Hi Thomas, not sure, if I understood you correctly. We normally do a fetch on the repo. And after that a fast forward merge on the release branches with a right-click on the branch within the branches window. So there it would be nice to have the possibility to select more that one branch, right-click and then use "Fast-forward merge" to fast forward merge all selected branches in one go.
If a local branch matches its tracked branch in the Standard window, it will be fast-forwarded automatically by pull (even if it had been rebased - just like in the other windows). Could you please explain why you only want to do that selectively?
So far we are not using the Standard window, but the "old" GUI. Every now and then I fetch the latest changes of our supported release-branches, about 3-5 branches normally. Then I mark each of them, use right-click to fast-forward merge the latest changes from our server. So in that case I would be nice to be able to select the release-branches and use fast-forward merge to each of it in a row.
You may give the Standard-window a try for this repository and let me know if you'd like this Pull behavior. Then we can consider to add it (optionally) to the Working Tree and Log window, too.
Jepp, I will. Thanks for the fast reply