Manish Katiyar <mkatiyar@gmail> wrote: ,---- | > As you can expect I had changed this file and already committed this | > change and I got the same changes with the "git pull". My question is | > how | > do I merge them both to have the correct changes, or how do I resolve | > the conflicts in such cases. Here I can do it manually because there | > is only | > one file but what if there are lot many files. I tried "git merge" but | > that doesn't seem to do anything. `---- imho, if you have conflicts (like the one shown above) there isn't much that any auto-merge can do much about. you have to resolve it manually. kind regards anupam -- To unsubscribe from this list: send an email with "unsubscribe kernelnewbies" to ecartis@xxxxxxxxxxxx Please read the FAQ at http://kernelnewbies.org/FAQ
