We have created git repository A.git installed gerrit 2.8.1. based on the
i pushed the source to A.git repository *Master_Branch.*
Developer pushed changes to A.git *Master_Branch* Now chipset_venodor has
given the latest source we have to merge with our Master_Branch , we
created the new branch & pushed the latest chipset source code to new
branch (*Chipset_Master*) & created the tag -- Chipset_Tag.
We have downloaded the Master_Branch did the merge with Chipset_Tag &
observed that git is not performing auto merge , we compared the files not
line conflict , white space also but unable to auto_merge
Quick response is very much appreciated.
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
For more options, visit https://groups.google.com/groups/opt_out.