2020-09-28

The results of merge code are inconsistent with expectations

There is a strange result after merging code. The operations are as follow:

1.Create a branch from master named release_test, which just contains one userDO2VONew method in AdminUserHServiceImpl.java. enter image description here

2.The branch develop also just contains one userDO2VONew method.

3.Merge the develop branch to release_test branch enter image description here

4.But the result of AdminUserHServiceImpl.java contains two userDO2VONew methods. enter image description here

The version of gitlab is GitLab Community Edition [12.3.5]

What should I check first for this problem? Many thanks in advance!



from Recent Questions - Stack Overflow https://ift.tt/3ifEuDK
https://ift.tt/335VwQ4

No comments:

Post a Comment