Trouble merging upstream changes back into my branch Trouble merging upstream changes back into my branch git git