Vasudev Kamath wrote (15 Oct 2012 17:38:41 GMT) : > On 19:08 Mon 15 Oct , intrigeri wrote: >> I think you should read the documentation about "-s ours", >> before concluding you can't merge it back to master.
> Tried that but what here happens is wheezy branch is based on master > which doesn't have any 38 related history at all. So merging will > overwrite my 39 work. (I tried this) It's unclear to me how "git merge -s ours", if done in the correct direction, could overwrite any work in the current branch, but I may have misunderstood the problem entirely, and I don't care that much, so let's leave it at that. Cheers! -- To UNSUBSCRIBE, email to debian-mentors-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/85ehks57z7....@boum.org
