Actually, I'm getting a conflict in trunk, can you just merge from trunk and resolve that conflict please?
« Back to merge proposal
Actually, I'm getting a conflict in trunk, can you just merge from trunk and resolve that conflict please?