I am really new to git. We are some to work on a project. I pulled the first time the git on week ago. Then numbers of modifications have been made since. I then tried to commit and push some modification, here's the message I got :
error: failed to push some refs to 'ssh://forumdesy@ftp.forumdesthinktanks.fr/homez.353/forumdesy/sources'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.
The I pulled, and here's the message :
...(a list of auto-merging and conflicts and )...
Automatic merge failed; fix conflicts and then commit the result.
How can I fix that ?
Best, Newben,