Merging branches on subversion

Could someone explain to me the process behind branching and merging? I don’t know if I am doing something wrong but my merges are going very wrong. Here is my scenario:

My repository is as follows:

  • Git keeping separate branches in sync
  • Does GitLab permit Wiki Merge Requests?
  • Is it possible to merge in Git without being on the merged-to branch?
  • Merging changes from master into all branches using Git?
  • Using git, how to do a 'use theirs' during a conflict?
  • git diff-tree showing changedset already merged
  • /repo
        |- branches
        |- tags
        |- trunk
            |- readme.txt         //readme stores v1.0
    

    Now I need to make 2 branches; 1 for new changes and 2 for bug fixes and they are as follows:

    /repo
        |- branches
            |- dev
                |- readme1.txt    //readme renamed to readme1 and stores v1.0
                |- readme2.txt    //this file is empty
            |- bugfix
                |- readme.txt     //readme stores v2.0
        |- tags
        |- trunk
            |- readme.txt         //readme stores v1.0
    

    Details are:

    • both “dev” and “bugfix” are direct branches to trunk created at the same revision
    • 1 person made a change to bugfix (see diagram top)
    • another person renamed readme.txt, made some modification and create a new file.

    So when all changes are to be merged to the trunk it should be as follows:

    /repo
        |- branches
        |- tags
        |- trunk
            |- readme1.txt         //readme stores v2.0
            |- readme2.txt         //this file is empty
    

    To achieve this result, how should i proceed to merge my files?
    I did try:

    1. merging “dev” and “bugfix” which is not working because my files are being overwritten instead of being merged
    2. merging “bugfix” to “trunk” followed by merging “dev” to “trunk” which is also not working as my files are still being overwritten instead of being merged

    I am using Tortoise SVN connecting to an Apache Subversion repository. I really tired of trying to merge and god knows how many times i tried from all the folders that i checkout. Hope someone can help me.

  • git proper way to fix topic after branch merge
  • SVN merge individual file revisions from a branch into trunk
  • Git pushing unfinished changes to repo
  • Merging 2 branches together in GIT
  • In Git, is there a way to automatically mark all newer vesions of files in a merge conflict as correct?
  • Git merge different file names
  • One Solution collect form web for “Merging branches on subversion”

    Here is a discussion on the bug for svn move tracking: Subversion not merging changes into renamed files?

    Git Baby is a git and github fan, let's start git clone.