Projects information

Chunk

Conflicting content
menu.clear(); menu.add(0, ADD_GROUP, 0, "Add group"); menu.add(0, WRITE_GROUP_TO_TAG, 0, "Write dynamic group to tag"); <<<<<<< HEAD menu.add(0, 2, 0, "debug load"); ======= >>>>>>> f77535fcd8dd4659e897fc25ffbbde3547d49512 return true; }

Conflicting content

		menu.clear();
		menu.add(0, ADD_GROUP, 0, "Add group");
		menu.add(0, WRITE_GROUP_TO_TAG, 0, "Write dynamic group to tag");
<<<<<<< HEAD
		menu.add(0, 2, 0, "debug load");
=======
>>>>>>> f77535fcd8dd4659e897fc25ffbbde3547d49512
		return true;
	}

Solution content
menu.clear(); menu.add(0, ADD_GROUP, 0, "Add group"); menu.add(0, WRITE_GROUP_TO_TAG, 0, "Write dynamic group to tag"); menu.add(0, 2, 0, "debug load"); return true; }

File
GroupsActivity.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
return true; } <<<<<<< HEAD case 2: { IdentityProvider ident = new DBIdentityProvider(mHelper); Intent intent = new Intent().setClass(this, HandleGroupSessionActivity.class); intent.setData(Uri.parse("dungbeetle-group-session://suif.stanford.edu/dungbeetle/index.php?session=519e513d66bc89f4cbbfb1f127ae2c40&groupName=cs294s&key=WwBUcE4Rf8LKQebVfgsp9g%3D%3D")); startActivity(intent); return true; } ======= >>>>>>> f77535fcd8dd4659e897fc25ffbbde3547d49512 default: return false; } }

Conflicting content

            return true;
        }
<<<<<<< HEAD
        case 2: {
                IdentityProvider ident = new DBIdentityProvider(mHelper);
                
                Intent intent = new Intent().setClass(this, HandleGroupSessionActivity.class);
                intent.setData(Uri.parse("dungbeetle-group-session://suif.stanford.edu/dungbeetle/index.php?session=519e513d66bc89f4cbbfb1f127ae2c40&groupName=cs294s&key=WwBUcE4Rf8LKQebVfgsp9g%3D%3D"));
                startActivity(intent);
            return true;
        }
=======
>>>>>>> f77535fcd8dd4659e897fc25ffbbde3547d49512
		default: return false;
		}
	}

Solution content
return true; } case 2: { IdentityProvider ident = new DBIdentityProvider(mHelper); Intent intent = new Intent().setClass(this, HandleGroupSessionActivity.class); intent.setData(Uri.parse("dungbeetle-group-session://suif.stanford.edu/dungbeetle/index.php?session=519e513d66bc89f4cbbfb1f127ae2c40&groupName=cs294s&key=WwBUcE4Rf8LKQebVfgsp9g%3D%3D")); startActivity(intent); return true; } default: return false; } }

Solution content

            return true;
        }
        case 2: {
                IdentityProvider ident = new DBIdentityProvider(mHelper);
                
                Intent intent = new Intent().setClass(this, HandleGroupSessionActivity.class);
                intent.setData(Uri.parse("dungbeetle-group-session://suif.stanford.edu/dungbeetle/index.php?session=519e513d66bc89f4cbbfb1f127ae2c40&groupName=cs294s&key=WwBUcE4Rf8LKQebVfgsp9g%3D%3D"));
                startActivity(intent);
            return true;
        }
		default: return false;
		}
	}

File
GroupsActivity.java

Developer's decision
Version 1

Kind of conflict
Case statement
Method invocation
Return statement
Variable

Projects >> dungbeetle >>199f10c42fbe54e01db860bad92c865877b3452f