Details
-
Type:
Task
-
Status:
Closed
-
Priority:
Minor
-
Resolution: Fixed
-
Affects Version/s: None
-
Fix Version/s: 2.1.0
-
Component/s: Development Environment
-
Labels:None
Description
Just tried this and there are a lot of conflicts. Reverted by using git reset --merge
These conflicts are due to major changes happening in both branches to the same files (pypo being merged with show-recorder in 2.0.x).
These conflicts are due to major changes happening in both branches to the same files (pypo being merged with show-recorder in 2.0.x).