Base solution for your next web application
Starts in:
01 DAYS
01 HRS
01 MIN
01 SEC
Open Closed

Version Management #9044


User avatar
0
muhittincelik created

Hi,

I have some questions about version management.

I created a repository at Github (private). And i copied all 8.5 version files. And i created 2 branch named dev and aspnetzero. i edited some common files at dev branch. I copied new 8.6 to aspnetzero branch and merge into dev branch. I resolved the conflicts on common files.

Everything is ok now. My code upgraded to 8.6.

When i want to upgrade my code to 8.7; i copied all 8.7 files to aspnetzero branch again with overwrite. I merged again aspnetzero branch into dev branch and this step overwrites all my developments on dev branch.

What is wrong ?

Muhittin


1 Answer(s)
  • User Avatar
    0
    maliming created
    Support Team

    hi

    You can look at the previous discussion: https://support.aspnetzero.com/QA/Questions/6285