Coming soon - Get a detailed view of why an account is flagged as spam!
view details
5
How to create a Master and merge from develop after never having a master?
Post Body

So... the thing is I never had a master because of various reasons, I had an accident after the first release, so the guy who continued my work did quite a mess with the repo. Later on, without having the time to fix it I keep working on the develop branch, simply tagging the "release versions". So now I'm really in need of a master branch.

How can I do that? This is what I have:

Develop:  A - B - C - - -  D - H -I
              |\          /|
FeatureX:     | E - F - G  |
              |            |
TAGS          R1           R2

And what I would like to do is to have something like this:

Master         J - - - - - - K
              /            /
Develop:  A - B - C - - -  D - H -I
              |\          /|
FeatureX:     | E - F - G  |
              |            |
TAGS          R1           R2

Is it possible? Or should I start a new one and cherry pick all the commits by hand...


Update:

I get is something like this on gitkraken:

Master          - - - - - - - - - - - J - K
               /            - - - - - - - /
              /            /
Develop:  A - B - C - - -  D - H -I
              |\          /|
FeatureX:     | E - F - G  |
              |            |
TAGS          R1           R2

Even after editing J with the same date as B or K as D

Author
Account Strength
100%
Account Age
11 years
Verified Email
Yes
Verified Flair
No
Total Karma
118,887
Link Karma
21,264
Comment Karma
96,945
Profile updated: 3 days ago
Posts updated: 9 months ago

Subreddit

Post Details

We try to extract some basic information from the post title. This is not always successful or accurate, please use your best judgement and compare these values to the post title and body for confirmation.
Posted
6 years ago