| Chunk |
|---|
| Conflicting content |
|---|
{
return 0;
}
<<<<<<< HEAD
int Private(String nick,String msg,User From)
//TODO
=======
int Private(String nick,String MsgSend,User From){
String Msg = "Mensage privado de "+From.getNick()+":\n\n"+MsgSend;
sender.SendTo(From, nick, Msg);
>>>>>>> c8f701f0990a7a3b99f3b8dbde52f2f5ca22d7b1
return 0;
}
} |
| Solution content |
|---|
return 0;
}
int Private(String nick,String MsgSend,User From)
{
String Msg = "Mensage privado de "+From.getNick()+":\n\n"+MsgSend;
sender.SendTo(From, nick, Msg);
return 0;
}
} |
| File |
|---|
| Commands.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Method signature |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
if(pq.countEntities()==0)
{
Entity FirstUser=new Entity("users");
<<<<<<< HEAD
FirstUser.setProperty("Nick","16BITBoy");
FirstUser.setProperty("email","aperezhrd@gmail.com");
=======
FirstUser.setProperty("Nick","Arkangel");
FirstUser.setProperty("email","arkangelhacket@gmail.com");
>>>>>>> c8f701f0990a7a3b99f3b8dbde52f2f5ca22d7b1
FirstUser.setProperty("Snooze","false");
FirstUser.setProperty("Mod","true");
datastore.put(FirstUser); |
| Solution content |
|---|
if(pq.countEntities()==0)
{
Entity FirstUser=new Entity("users");
FirstUser.setProperty("Nick","Zero");
FirstUser.setProperty("email","zero@h-sec.org");
FirstUser.setProperty("Snooze","false");
FirstUser.setProperty("Mod","true");
datastore.put(FirstUser); |
| File |
|---|
| DataManager.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
if(user.isMod())users.setProperty("Mod", "true");
else users.setProperty("Mod", "false");
datastore.put(users);
<<<<<<< HEAD
=======
>>>>>>> c8f701f0990a7a3b99f3b8dbde52f2f5ca22d7b1
}
} |
| Solution content |
|---|
if(user.isMod())users.setProperty("Mod", "true");
else users.setProperty("Mod", "false");
datastore.put(users);
}
} |
| File |
|---|
| DataManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |