How to resolve GIT conflicts in Katalon

Archive
,
1

Hi team,

we are using GIT repositories as integration tool for the source control.
but whenever 2 or more people are pushing the changes to the repository we are getting conflicts can you please help with it.

we tried the following solutions :

  1. git bash : using stash and they pulling the latest code and applying our stash.
  2. deleting the code first few times as the coding part was less.
  3. ignoring our local changes and pulling the latest ones.

the tool doesn’t support the inbuilt feature for stashing & conflict resolution.
can you please let us know how to stash the local changes

2

You should try Kdiff3 http://kdiff3.sourceforge.net/

3

hi,

check this page and using google you will find more
https://help.github.com/en/articles/resolving-a-merge-conflict-using-the-command-line