1 .Jan_2014 - initial source we created the Master_Branch.
2. Feb_25 we got new source & created the new empty branch Chipset_Master &
the latest chipset source code & created the tag -- Chipset_Tag.
3. When we merged Chipset_Tag in Master_Branch -- after merge so many
conflicts , we compared the files its not line conflict , white space also
but unable to auto_merge the files.
My question is auto merge should resolve the conflicts if its not line
conflict, white space problem.
We have not yet pushed the merged source to Master_Branch.
Please help us to resolve the issue.
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.