Reputation: 17806
Let's say I have git repo like this:
master
webapp-1252
webapp-1285
webapp-1384
webapp-1433
webapp-1524
webapp-824
x_____jira_
x_webapp-11
x_webapp-11
x_webapp-11
z_____jira_
I've updated all of them and ready to push them all to svn or something. Then someone makes a quick change that would require me to basically go through all of them to merge etc.
Is there a shortcut to go through all the branches I have here, merge them with whatever work that was fetched, then rebase them?
Upvotes: 3
Views: 534
Reputation: 3831
See those answers for solutions of similar problems:
I believe both of them can be used to solve Your problem.
Upvotes: 1