Welcome to the CSC Q&A, on our server named in honor of Ada Lovelace. Write great code! Get help and give help!
It is our choices... that show what we truly are, far more than our abilities.


+14 votes

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.

asked in CSC305 Fall 2022 by (1 point)

1 Answer

+10 votes

Yes it will let you pull after you have committed the changes. There will be conflicts that you will have to manually fix.

answered by (1 point)