Use of git rebase in public feature branches

If you rebase, you rewrite history. And just like in the real world, if you want to rewrite history, you need a conspiracy: everybody has to be “in” on the conspiracy (at least everybody who knows about the history, i.e. everybody who has ever pulled from the branch). As long as the circle of people … Read more

Workflow engine in Javascript [closed]

As suggested by katspaugh I’m posting the libraries I found as the answer. List of workflow libraries that I’ve found until now: XState – https://github.com/davidkpiano/xstate Workflow.js for Backbone.js https://github.com/kendagriff/workflow.js Sprout Workflow Engine https://github.com/bstaats/workr Javascript Finite State Machine https://github.com/jakesgordon/javascript-state-machine State chart https://github.com/DavidDurman/statechart machina.js https://github.com/ifandelse/machina.js jWorkflow https://github.com/tinyhippos/jWorkflow Stately https://github.com/fschaefer/Stately.js

git workflow: Can I prevent a certain file from being merged to another branch but still keep it under version control?

I found an answer on another question on Stack Overflow, credit goes to fcurella: Let’s say you want to exclude the file config.php On branch A: Create a file named .gitattributes in the same dir, with this line: config.php merge=ours. This tells git what strategy to use when merging the file. In this case it … Read more

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)