I had an issue which I am not sure how I got there (code modified and then reverted in a later revision)
As I am not 100% sure if it is expected behaviour by git or something else happened, I just wanted to see if anyone here could enlighten me? I branched out master (feature-1) and made some changes to file1.php I branched out master (feature-2 : without changes to file1.php merged back) and made some other changes to file1.php Eventually, I merged feature-1 back to master. Then I merged feature-2 back to master. It appears that the merge in feature-2 has reverted the changes in feature-1. Is that possible? I thought git would be able to handle that? Not sure how it could happen -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/git-users/0bfb0388-25d4-4728-99f4-7940c6f19725n%40googlegroups.com.
