Hi, there is a strange result after merging code. the operations is as following:
- create a branch from master named ‘release_test’, which just contains one
userDO2VONew
method inAdminUserHServiceImpl.java
.
- the branch ‘develop’ also just contains one ‘userDO2VONew’.
- merge the ‘develop’ branch to ‘release_test’ branch
- but the result of
AdminUserHServiceImpl.java
contains twouserDO2VONew
methods.
the version of gitlab is GitLab Community Edition [12.3.5]
what should i check first for this problem?
many thanks in advance!