trying to merge branch:community into dev (community -> dev).
However, without conflict-solving process, some of the files in 'dev' are automatically merged into 'branch:community'. (some files : dev -> community)
So I cannot update my new files into dev branch..
Why is this problem happening? and how can I fix it?
This problem happens during PR , merge process. Tried making another new branch which has same content in it, and merge again but same problem happens again
- co-working now, so cannot do force work