Multiple repos pull from from different branches at once
Answered
Hi,
T have a Project with multiple repos.
There is one repo wich is the "base" for all others.
This is how i set up the "aux" repo to pull from "base" with a remote.
When i want to pull from base/master from the "aux" repo i use the pull changes menu:
Everything works good. But i have multiple repos like "aux" that extend "base" and i have to do this action multiple times during the day.
My question is if there is a way to speed up my workflow pulling from "base/master" from multiple repos at once?
Please sign in to leave a comment.
Pull action is limited by a repository but there is the Update project action, that pulls all git roots in the project at once. However, it only pulls from the tracked branches. So you could configure aux and other repositories you need to update to track branches in base, if it works for you of course.
There are requests to let select remote/branch during Update project, see https://youtrack.jetbrains.com/issue/IDEA-89255
I have to switch many times between branches therefore that would, unlukily, not be a good solution for me.
Now i wrote a npm script to pull the base branch for every "dependent-repo" wich is fastest but i lose the merge confict window that would pop up.
That feature is interesting i suppose i'm going to wait for that.
Thank you for the answer.
> but i lose the merge confict window that would pop up.
If the command-line script ends-up with conflicts, just go back to the IDE and call VCS - Git - Resolve conflicts action, and you'll get the dialog.
It works.
Thank you.