git merge issues

[Mandeep Sandhu]

> Now my question is that do I need to solve the merging issue manually or
> is there any way to solve this using git?

This is in no way related to the Linux kernel. You should be asking
this on the git mailing list.

Short answer - you will have to manually fix the conflict. Git could
not do it automatically and hence it's asking you to fix it. After
fixing the conflict, do 'git add <file>' and then 'git commit'.

HTH,
-mandeep


>
> Thank you.
> Raghavendra
>
> -------------------------------------------------------------------------------------------------------------------------------
> [ C-DAC is on Social-Media too. Kindly follow us at:
> Facebook: https://www.facebook.com/CDACINDIA & Twitter: @cdacindia ]
>
> This e-mail is for the sole use of the intended recipient(s) and may
> contain confidential and privileged information. If you are not the
> intended recipient, please contact the sender by reply e-mail and destroy
> all copies and the original message. Any unauthorized review, use,
> disclosure, dissemination, forwarding, printing or copying of this email
> is strictly prohibited and appropriate legal action will be taken.
> -------------------------------------------------------------------------------------------------------------------------------
>
>
> _______________________________________________
> Kernelnewbies mailing list
> Kernelnewbies at kernelnewbies.org
> http://lists.kernelnewbies.org/mailman/listinfo/kernelnewbies