From your description, it seems like commit #2 is a merge commit. This is good practice, because if you already have recently merged dev
into FB-A
by the time you merge FB-A
into dev
, you will likely have little to no merge conflicts. Commit #2 will have important information on how to merge updates in dev
and FB-A
together, so it is normal practice to keep the merge commit. It is also normal for this merge commit to land on the dev
branch when you merge it in, since you are adding commits from FB-A
that weren't in dev
to dev
.
Note: Even if you wanted to remove commit #2 before merging into dev
, you would likely need to create another merge commit anyway to resolve conflicts.