Will git let you pull if locally committed changes conflict with my remote changes? I said that git will let me pull but then I will get "HEAD>>>>" message with unsolved conflicts and I have to manually solve conflicts. But I was unsure about it.
Yes it will let you pull after you have committed the changes. There will be conflicts that you will have to manually fix.
