git messed up ...
@remko.nijzink could you help me for a git problem ? I have created a new branch to work on the shape of the stress factor but without paying attention I also modified some files contained in the master branch in the same time. I would like to merger the two branches but there is a conflict ... How can it be solved ?