Quantcast
Channel: Open Data - conflict
Browsing latest articles
Browse All 6 View Live

Panels 3 vs Views 2 Showdown 1: Views menu paths override Panels menu paths

If you are trying to figure out why your panel site is wrong or has no content at all, you may have reached this page.Drupal panels not deleting menus cleanly? No, that's not it. At least in this case,...

View Article


Choosing all the remotely changed files in a git conflicted merge

Stricken with fear at the thought of handling a huge conflicted merge file by file, when you know you can just pick one side of the conflict and be done with it?Whengit pullgives you the bad news...git...

View Article


Procedure for resolving a a left-behind branch that has merge conflicts

DRAFT. Better methods from better minds invited!Situation: Someone has been working away wonderfully on a git branch on your project. You do some crazy stuff with it over the weekend, and when they, on...

View Article
Browsing latest articles
Browse All 6 View Live