Skip to content

Issue with build artifact including files not in PR. #41

@Jack-Lange

Description

@Jack-Lange

Hello, I am observing an unexpected (but, as far as I can tell, correct) behavior with the GitCopyDiff devops pipeline activity.

  1. branch 1 diverges from master and changes are made on the branch
  2. branch 2 diverges from master and changes are made on the branch
  3. branch 2 is merged back into master, triggering the pipeline
  4. the build artifact for branch 2 is generated and contains only files that were changed in branch 2.
  5. branch 1 is merged into master, triggering the pipeline
  6. the build artifact for branch 1 is created and contains all changes from branch 1 and branch 2.

The issue is avoidable by merging master into branch 1 before merging branch 1 into master.

Is there an argument that can be passed to GitCopyDiff that will cause only the changes from branch 1 to be included in the build artifact generated in 'step 6'?

If not, could I submit a PR to include that feature?

Thanks for your time!

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions