As per current DB structure actions are embedded inside the JSObjects. Every new method in JSObjects results in new action getting created in DB. Consider user updates the JSObject.myFun1 then user will have changes at 2 locations Queries directory under myFun1 file Body of JSObject1 We should not commit these duplicates and JSObject body should be committed as is. These steps surely makes it easier to resolve the conflicts even if occurs at same line. |
||
|---|---|---|
| .. | ||
| src | ||
| pom.xml | ||