[git-users] [SOLVED?] (was: Avoid conflicting merges for the other user by using revert (does not work))

>>> "UB" == Uwe Brauer writes: Sorry, I am an idiot. Below a solution, not sure whether it is the best solution > * Avoid conflicting merges for the other user by using revert > Hi > Usually if two users push to a common repository conflicting merges might > occur, and can be resolved

[git-users] Avoid conflicting merges for the other user by using revert (does not work)

* Avoid conflicting merges for the other user by using revert Hi Usually if two users push to a common repository conflicting merges might occur, and can be resolved manually. I am faced with a situation (with students who don't know git and only use git via matlab's restricted git

Re: [git-users] conflicting merges (git equivalent of hg resolve)

On Fri, Nov 17, 2023 at 10:39:41PM +0100, Uwe Brauer wrote: [...] > while as I learned right now, > git is more relaxed about it, > so I could proceed with other commands and git did not complain really. [...] > Ok, so no > git resolve --options > command > > but the add command takes care