Lindsay-Rae McIntyre will be allowed to start working at Microsoft in July.

Big Blue claimed that McIntyre violated a one year non-competition agreement and was likely to disclose IBM’s diversity data and hiring plans to a competitor.

“We’re glad the action has been resolved to the satisfaction of all parties and that McIntyre will not begin her new responsibilities until July”, an IBM spokesman said in a statement.

A Microsoft spokeswoman said in a statement the company is pleased to have resolved the matter.

IBM had asked a judge to enforce the non-competition agreement, saying it would help ensure McIntyre did not disclose to Microsoft highly confidential and sensitive information about IBM’s efforts to recruit and maintain a diverse workforce.

Employment lawyers said the lawsuit was unusual because IBM argued its diversity data and strategy were economically valuable “trade secrets,” a legal term typically associated with cutting-edge technologies or closely guarded recipes.

McIntyre’s lawyers said in court filings that she would not misappropriate any proprietary IBM information and that the information would not be useful to her or Microsoft anyway.

Microsoft, which was not named in IBM’s lawsuit, has said it was not interested in IBM’s confidential information.