I found the solution reading the link that Gary gave (and I suggest to follow this way). Summarizing to resolve the tree conflict committing your working directory with SVN client 1.6.x you can use: svn resolve –accept working -R . where . is the directory in conflict. WARNING: “Committing your working directory” means that your … Read more
The message “Already up-to-date” means that all the changes from the branch you’re trying to merge have already been merged to the branch you’re currently on. More specifically it means that the branch you’re trying to merge is a parent of your current branch. Congratulations, that’s the easiest merge you’ll ever do. 🙂 Use gitk … Read more
The most troubling feature new developers to DVCS need to realize is about the publication process: you can import (fetch/pull) whatever remote repo you need you can publish (push) to any (bare) repo you want From that, you can respect a few rules to make your questions easier: only rebase a branch if it hasn’t … Read more
The claim of why merging is better in a DVCS than in Subversion was largely based on how branching and merge worked in Subversion a while ago. Subversion prior to 1.5.0 didn’t store any information about when branches were merged, thus when you wanted to merge you had to specify which range of revisions that … Read more
After the merge, it’s safe to delete the branch: git branch -d branch1 Additionally, git will warn you (and refuse to delete the branch) if it thinks you didn’t fully merge it yet. If you forcefully delete a branch (with git branch -D) which is not completely merged yet, you have to do some tricks … Read more
I’m not familiar with resolve, but I’ve used the others: Recursive Recursive is the default for non-fast-forward merges. We’re all familiar with that one. Octopus I’ve used octopus when I’ve had several trees that needed to be merged. You see this in larger projects where many branches have had independent development and it’s all ready … Read more
I suspect you’re confused here because it’s fundamentally confusing. To make things worse, the whole ours/theirs stuff switches roles (becomes backwards) when you are doing a rebase. Ultimately, during a git merge, the “ours” branch refers to the branch you’re merging into: git checkout merge-into-ours and the “theirs” branch refers to the (single) branch you’re … Read more
You can concatenate the arrays with +, building a new array let c = a + b print(c) // [1.0, 2.0, 3.0, 4.0, 5.0, 6.0] or append one array to the other with += (or append): a += b // Or: a.append(contentsOf: b) // Swift 3 a.appendContentsOf(b) // Swift 2 a.extend(b) // Swift 1.2 print(a) … Read more
I came across the same problem. To be precise, I have two branches A and B with the same files but a different programming interface in some files. Now the methods of file f, which is independent of the interface differences in the two branches, were changed in branch B, but the change is important … Read more
The solution is very simple. git checkout <filename> tries to check out file from the index, and therefore fails on merge. What you need to do is (i.e. checkout a commit): To checkout your own version you can use one of: git checkout HEAD — <filename> or git checkout –ours — <filename> (Warning!: If you … Read more