Merge from Dev to Main

(0) Share

Report

Posted on by Yuji

4,131

Hi,

Before I merge from Dev to Main branch, is it a best practice to download the latest version from Server to local folder first? Because I found that if I did not do that, when I check in my changes, Azure DevOps will ask me to choose local version or server version for some items.

Thanks,

I have the same question (0)

All responses (2)

Answers (2)

Verified answer

nmaenpaa 101,162 Moderator on at

Like (0)

Report

Yes, your local code should be up to date before merging from Dev to Main.

Was this reply helpful? Yes No
Verified answer

Sukrut Parab 71,710 Moderator on at

Like (0)

Report

Yes you have to do that , otherwise you are going to get conflicts which you are getting. You can also automate this step and run it on daily basis, so that you don't have to do that manually.

Was this reply helpful? Yes No