search

repobee / repobee-sanitizer

A plugin for sanitizing master repositories before distribution to students
MIT License
2 stars 3 forks source link

Bugifx for string matching on tracked and untracked #35

Closed tohanss closed 4 years ago

tohanss commented 4 years ago

What is the PR tag for bugfix? is it [bug] or [bugfix] or something else

codecov[bot] commented 4 years ago

Codecov Report

Merging #35 into master will not change coverage. The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #35   +/-   ##
=======================================
  Coverage   98.52%   98.52%           
=======================================
  Files           6        6           
  Lines         136      136           
  Branches       23       23           
=======================================
  Hits          134      134           
  Misses          1        1           
  Partials        1        1

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update a6bae31...c685732. Read the comment docs.

tohanss commented 4 years ago

Closed because the bugfix somehow made it into the other PR despite being on different branches

If you read this: What did i do wrong?

slarse commented 4 years ago

@tohanss The tag is [fix]. Should probably be documented. But this isn't really a bugfix, it's a fix of an imperfect test. So I'd use the [test] tag.

Anyway, there are two things that have gone wrong here, and they're both because you haven't branched out from a synced master branch.

First, you're reusing a branch that's all ready been merged. That's both confusing, and will often lead to merge conflicts as we use squashing. So, never reuse a merged branch.

Second, you first made these changes for this PR, then you branched out from this branch to the one used in #36 , instead of branching out from a synced master. Thus, all changes from this branch are also an that branch. Always branch out from master.

slarse commented 4 years ago

Now, let's fix this.

First, sync master. Then, branch out from master and recreate the intended changes from this PR (either by cherry picking, or by just making a new commit since the changes are so few). Then open a new PR.