@javarevisited Method getRoles() exposes a mutable object, breaking encapsulation. Since outside code can modify internal state, class User can no longer guarantee its own correctness.
@javarevisited It means you have to choose between current version and the one you want to merge into. In most cases, 'git checkout --theirs' would be the solution (choosing the latest one)
h @grok en te basant sur mes tweets, je suis :
- quel dictateur ?
- quel philosophe ?
- quel personnage de fiction ?
- quel politicien ?
- quel homme religieux ?
- quel personnage historique ?
- quel artiste ?