Why can't a branch not be merged with another / the master?

Started by rvaneerd, March 28, 2025, 11:52:57 AM

Previous topic - Next topic

rvaneerd

Hi there,
I'm rather new to the branching concept so bare with me.
Besides my master branch, I have three others, let's name them A, B & C.
For branches B & C, I have the option to merge them with the master branch.
However, for branch A, I do not have that option.

The only reason I can come up with for that is that branch A is (still) identical to the master and hence there's nothing to merge. Whilst creating a screenshot (see below), I also noticed that the latest commit timestamp of branch A is the same as the master's. This actually confirms my assumption but I'm still not sure as I'm new to the branching stuff.
Can anyone help me out with this?

FYI, branch A may have been created as my first starting point for the branching functionality provided by coArchi as at first, I was the only one using Archi / coArchi and I only used coArchi for version control.

Regards,
Rob.

Phil Beauvoir

Hi,

if branch A is at the same point as master (and it's a local branch, not remote) then you're correct, there's nothing to merge.

Phil
If you value and use Archi, please consider making a donation.
Ask your ArchiMate related questions to the ArchiMate Community's Discussion Board.

Xiaoqi

Depending on where you put the repository, you can also check some more detail from the repo online.

For instance, our team put repository in Azure DevOps, so besides see the line in coArchi branches, like attached picture, you can go to DevOps branches page to check the "Behind|Ahead" detail numbers.

As Phil mentioned, if there's 0|0, then nothing required for "merging". Try to create some changes in your branch A, commit/publish A, then check again.

Good luck,
Xiaoqi