Git Manage Branches

Asked

Viewed 112 times

0

I’m looking to manage the new features branches. Currently I can see from Gitlab how many commits the branch is in front of or behind the project’s default branch.

However I would like to know if the merge from the default branch to the branch will generate some conflict, this for all project branches.

Is there any tool that evaluates the project branches and gives an overview of possible conflicts that may occur with respect to the project’s default branch?

Or some git command that can give me that view?

In short, it’s a project where there are several contributors, through gitlab I can already see the commits of each branch that are in front of or behind the default branch, what I need to know is if there are any branches that would be conflicting with the default branch.

git gitlab

  • Already gave a git status on branch or master? It usually tells you how many commits you’re behind or if someone committed something

  • It’s a project where there are several collaborators, through gitlab I can already see the commits of each branch that are in front of or behind the default branch, what I need to know is if there is any branch that would be conflicting with the default branch.

  • Wow, when you merge it will point out you have conflicts, so just solve them.

  • But I want the view of the other developers' branches, I won’t keep simulating Merge Request to see if the other branches have conflict or not.

  • @Pablotondolodevargas, what’s the point of looking at the developers' branches to see if they have conflicts? For all I’ve experienced, this is bad practice. A much better practice is to use a third generation VCS feature that allows you to merge at last (merge after commit), unlike a second generation VCS (merge before commit)

1 answer

1

In the projects I work, we open Pull Request (we use github here, in Gitlab I believe it is Merge Request) for every branch that has to be merged with master. Having the request, it is possible to see if there are conflicts and request approval (code review) from colleagues.

If the goal is just to check if it will give conflicts, you do not need to confirm the creation of the request - you can see the modifications before.

  • I really needed a tool to show me this, today the project already has 20 branches and about 24 contributors.

Browser other questions tagged git gitlab

You are not signed in. Login or sign up in order to post.