| strategy resolve resulted in: Failed [message #786624] |
Mon, 30 January 2012 11:49  |
 Marc Missing name
Messages: 18
Registered: March 2011 |
Junior Member |
|
|
Hi,
I have a master and a "development" branch, which branches from master.
In master was no commit since the branch and I want to merge the development branch back into master.
Seems to be simple enough, but I get:
Merge of revisions 7434221a533b1b4572838c7d75a782c38b606caf, fd57a12155596c4378d3833c480485ed2eae7e11 with base facf3a2df693d2dc18f1af37ae8bef6851792de1 using strategy resolve resulted in: Failed.
The master is in conflict state after that and I cant resolve it, because the merge tool is grayed out. I have to reset the master to get it all ok again.
I changed a few files and moved a few around to new directories. Nothing fancy, i thought?
What did I wrong?
I tried the stable version and the nightly from this day
I also tried to rebase the branch back into master but got:
Cannot cherry-pick commit '3b4fef6182be88b7db8d9cc709a12a1fc132ace9' because it has 2 parents, only commits with exactly one parent are supported.
Cannot cherry-pick commit '3b4fef6182be88b7db8d9cc709a12a1fc132ace9' because it has 2 parents, only commits with exactly one parent are supported.
Maybe that helps too?
[Updated on: Mon, 30 January 2012 11:52] Report message to a moderator |
|
|
] 
Search
Help
Register
Login
Home
