Does TOAD Team Coding Merge Editor handle Git remote conflicts or only DB <> local conflicts?

Toad for Oracle & DevOps Toolkit
1

Hello,

I am using TOAD Team Coding with Git and I would like to clarify the exact scope of the Merge Editor provided by TOAD.

From my understanding and experience, the Merge window seems to resolve conflicts only between:

· the database version of an object

· and the local working copy in the repository

However, I am not sure whether the Merge Editor is also intended to handle true Git conflicts, i.e. conflicts caused by:

1. another developer pushing changes to the remote branch

2. while I have local commits on the same object/file

3. resulting in a non-fast-forward push rejection or a git pull merge conflict

In other words, my questions are:

Does the TOAD Team Coding Merge Editor handle Git remote vs local conflicts (origin branch vs local branch)?

Or is it limited to database <> local repository synchronization conflicts only?

In the case of a real Git conflict (diverged local and remote branches), is it expected/best practice to:

· resolve it entirely from Git (CLI / Git Bash)

· then return to TOAD for commit/push?

· Is there an official recommended workflow when using Team Coding + Git to handle remote conflicts safely?

I would appreciate clarification on the intended design and best practice, as this would help standardize our team workflow.

Thank you in advance.

2

Hi yesbene94,

Team Coding Merge Editor handles diffs between DB and local repository. Real (remote) conflicts need to be resolved from Git.

Thanks,
Pavel

1 Like
3

Thanks for the reply.
Is it possible to configure the Toad UI so that Pull executes git pull origin master instead of the default git pull?
I believe this would be the simplest way to handle conflicts, as it would allow me to open the file directly in the local Git repository and resolve the conflict there.

4

You’re welcome. Unfortunately, that wouldn’t be possible to configure in Toad.