Skip to main content
Panther Knowledge Base

Should I receive merge conflicts every time I sync using the Panther GitHub Action Script?

  1. Last updated
  2. Save as PDF

QUESTION

Should I receive merge conflicts every time I sync using Panther's GitHub Action script?

ANSWER

This is not expected every time. This issue is currently inherent in Git workflows; if you make edits to files existing in the upstream repo, you'll encounter merge conflicts the next time you pull in updates. This conflict should only happen on the first pull. Subsequent pulls generally won't have conflicts unless you make further changes to the file.