I had the same problem, and in my case it seems to be due to the initial subtree commit being merge-squashed into the master branch. Looking through the subtree source I found this: https://github.com/git/git/blob/master/contrib/subtree/git-subtree.sh#L224 It looks like subtree greps your git log for git-subtree-dir: foo but doesn’t find a suitable commit. Try git log –grep=”git-subtree-dir: … Read more
Craig Stuntz does a good job of explaining that it is the designer related xml (the positions of entities and associations etc on the design surface) that causes most of the problems here. Conflict resolution within the edmx:Runtime element however, is very achievable. The best strategy for dealing with conflicts in the designer related xml … Read more
In this case, you should Take Source. The “Source” is the develop branch and the “Target” is the feature branch.
The idea is you use one common branch, and two (or as many as you need) customer specific branches. All common changes go into the master, and each customer branch gets changes that pertain only to that customer. Periodically (when master is considered to be at a stable point), you’ll merge changes from master into … Read more
Change the display filter to Show Conflicts (View->Show Conflicts), then in one of the input panes use Select All (Ctrl+A) followed by Take Left (Ctrl+L) or Take Right (Ctrl+R).
The answer is to use ConfigFactory.parseResource() in place of ConfigFactory.load(). Here is the finished result private lazy val defaultConfig = ConfigFactory.parseResources(“conf/env/default.conf”) private lazy val environmentConfig = ConfigFactory.parseResources(“conf/env/” + env + “.conf” ) private lazy val userConfig = ConfigFactory.parseResources(“application.conf”) private lazy val config = ConfigFactory.load() .withFallback(userConfig) .withFallback(environmentConfig) .withFallback(defaultConfig) .resolve()
You can just use concatenation: list = list_1 + list_2 If you don’t need to keep list_1 around, you can just modify it: list_1.extend(list_2)
UPDATE for TS4.1+ The original answer still works (and you should read it if you need an explanation), but now that recursive conditional types are supported, we can write merge() with to be variadic: type OptionalPropertyNames<T> = { [K in keyof T]-?: ({} extends { [P in K]: T[K] } ? K : never) }[keyof … Read more
You’re very close. Concatenating the arrays is done with the plus sign: materials = books + articles Sorting the combined array can be done by calling the sort_by method (mixed in from Enumerable) and passing in the attribute prefixed with &: materials.sort_by(&:created_at) This won’t be good performance-wise for large result sets. You might consider deriving … Read more
Find \R and replace with empty string. \R matches multiple linebreak styles, including most common \r\n and \n. Search Mode must be set to Regular expression.