search

testmanio / homebrew-tm

MIT License
0 stars 1 forks source link

Unable to resolve conflicts in tool #66

Open thamarai1414 opened 3 months ago

thamarai1414 commented 3 months ago

Area -> Functionality New Feature - NO Describe the bug - There's a conflict when attempting to fetch the latest changes from the development branch to the local environment Version - NO

Steps to reproduce:

  1. Create a new branch from dev
  2. Write your test cases
  3. Commit your cases to your local branch
  4. Merge to dev (reason commit behind)
  5. Go to your local branch
  6. Pull the latest dev
  7. Conflicts when attempting to fetch the latest changes
  8. Then it's overriding with the remote cases

Expected behavior - If the conflict occurs when attempting to fetch the latest changes from the development branch to the local environment we should able to resolve it in testman

Anything else? - NO

Yuviak commented 5 days ago

@NandhaSrinivasan Add comment for this ticket whether this issue is fixed or this is expected