This happened multiple times now, I hope this is the right place to ask this question, desperately need help.
We merged the code from a branch to master in GitHub, the merge show conflicts, so we use GitHub to solve the conflicts, after solving all the conflicts, we committed the merge, on the master it show 61 files changes, but on the branch it also show 21 files changed. So here are the questions:
- Git supposedly provide the easy merge process, but most of the conflicts are spaces, even newly added lines Git doesnt know what to do, ended up solving a lot basic code changes (in this case there were 30 conflicts), this is causing unnecessary human interactions (compare to ClearCase merge, Git is much dumber). After solving the conflicts, the program was not able to compile, this may cause by human errors.
- But why the merge process even touch the existing-development-completed branch, it show 21 files got changed, mostly changes are adding empty lines (there is one file it totally replace the whole file with exact same content), but we suppose to code freeze on the branch, now we dont even know this branch is still valid unless we have to validate each file changed
- Due to compile errors, so we decided to reverse the merge on the master, the 61 files seems back to original, but these 21 files on branch still remain changed, and now we dont know we can merge again or not
This happen few time already, some other teams stopped using GitHub merge process, I am not sure this only occur in our company or it is observed widely?
I dont know we should continue using GitHub actually if this basic merge process does not work.
What is the best practice using GitHub specially when this happened?