I was wondering what the best approach to resolving merge conflicts in a certain scenario was. In this scenario there are two developers(A and B) collaborating on a project together, developerA is the project maintainer therefore should be in charge of any change to the main branch of the project. DeveloperB develops a feature in… Read More Which branch should be merged into which when a merge conflict occurs in git

I have two branches in a Git repository. * 68d0cfc (HEAD -> master) Fixed error in makefile. Command rm is now erasing main.o, too. | * a2dcb6c (temp_branch) Temporary commit to save progress. |/ * c86fd55 structs trans_table_entry and trans_table created. Functions get_trans_table_available_entry, create_insert_new_trans_entry and compare_input_with_trans_key defined. * b8ba145 structs fsm_t and state_t created. Functions… Read More Why is git not complaining about merge conflict?

I just ran a git pull origin master and many of the merge conflicts are identical in HEAD and the upstream commit: <<<<<<< HEAD gem ‘fuzzy-string-match’ ======= gem ‘fuzzy-string-match’ >>>>>>> 50147a3519be5bc883dabce86525ee4f36640b22 There are dozens of files with the same situation, where the before and after are identical. Does anyone know what might cause this behavior?… Read More Git merge conflicts where HEAD + commit are identical