Does git distinguish between the trunk of master and a merged branch?
Lets suppose I branch of from master (A) and make a commit there (B) and then a commit on master (C) and then merge them (D):
Git: changes getting overwritten
Sorry if this has been answered before, but none of the suggested answers coming up for this topic shows an answer for something similar to my problem.