Skip to content

Commit

Permalink
resources: renamed ADJ fixture and updated map
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcallegari
mcallegari committed May 5, 2018
1 parent 6c3b609 commit 4327d36
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
0 .../fixtures/American-Dj-X-Scan-LED-Plus.qxf → .../fixtures/American-DJ-X-Scan-LED-Plus.qxf
View file
File renamed without changes.
3 changes: 2 additions & 1 deletion resources/fixtures/FixturesMap.xml
View file
Expand Up @@ -124,7 +124,7 @@
<F n="American-DJ-VPar" m="American DJ" d="VPar"/>
<F n="American-DJ-WiFly-EXR-Dotz-Par" m="American DJ" d="WiFly EXR Dotz Par"/>
<F n="American-DJ-WiFly-EXR-HEX5-IP" m="American DJ" d="WiFly EXR HEX5 IP"/>
<F n="American-Dj-X-Scan-LED-Plus" m="American DJ" d="X-Scan LED Plus"/>
<F n="American-DJ-X-Scan-LED-Plus" m="American DJ" d="X-Scan LED Plus"/>
<F n="American-DJ-XS-400" m="American DJ" d="XS 400"/>
<F n="American-DJ-XS-600" m="American DJ" d="XS 600"/>
<F n="Antari-X-310-Pro-Fazer" m="Antari" d="X-310 Pro Fazer"/>
Expand Down Expand Up @@ -870,6 +870,7 @@
<F n="Showtec-Pixel-Bar-12" m="Showtec" d="Pixel Bar 12"/>
<F n="Showtec-Power-Spot-9-Q6-Tour-V1" m="Showtec" d="Power Spot 9 Q6 Tour V1"/>
<F n="Showtec-Power-Spot-Q5" m="Showtec" d="Power Spot 9 Q5"/>
<F n="Showtec-QFX-Multi" m="Showtec" d="QFX Multi"/>
<F n="Showtec-Quatro" m="Showtec" d="Quatro"/>
<F n="Showtec-Shark-Beam-FX-One" m="Showtec" d="Shark Beam FX One"/>
<F n="Showtec-Shark-Wash-One" m="Showtec" d="Shark Wash One"/>
Expand Down

1 comment on commit 4327d36

@janosvitok
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When merging a branch to master, it's a good practice to do merge --no-ff.
It keeps the history cleaner:

  • it shows that a branch was merged
  • it keeps master the first parent of the commit (so when you look at the git tree log, you see what was master and what branch)

In this case, by merging master to branch and then back without no-ff, the first parent for some interval is newdef.

See also: https://developer.atlassian.com/blog/2016/04/stop-foxtrots-now/

Please sign in to comment.