Azure Devops and Data Factory

Hi!

It sounds like the main problem here is to clean a chaotic git repository. So you should look up how to address certain problems using the options git offers.

Some solutions you could look up further:

For 1.: Create a new branch from dev, clean the in-progress or abandoned code changes using an IDE like vscode and merge the new branch into prod.

For 2.: If the main branch should be prod, I would concentrate to get prod clean. As you only want to merge from dev to prod, there should be no need to do anything. You only need to take action if you want to remove made changes from prod.

For 3.: Try using the command line, and look into the git commands (in general very useful). You can use git bash, PowerShell, or the built-in terminal in VS Code. If you need multiple commits, try:

git cherry-pick <commit-hash1> <commit-hash2>

If that fails, running "git status" or checking the error message can give clues on what’s wrong.

For 4.: Vscode is a great editor imo, I would use it to address the problems.

Hope that helps, best regards and luck!