Git History is all messed up.

Question

Git History is all messed up.

Closed this issue 10 years ago · 2 comments

There is a branch jr_still_need_to_support_Swift_1.1 which should be master.

And the current master branch should be a beta branch continuing fixes on top of master to support Swift 1.2.

The Swift 1.2 branch should be kept up to date by rebasing on top of master periodically.

Answer 1 · 2015-03-18T14:02:22.000Z

Since No-one has forked this. I am gonna go back and rewrite history like a boss. Cuz I want it to make sense to me and to other people who may come along to look at this. (Looking at you thoughtbot) 😃

Answer 2 · 2015-03-19T13:26:42.000Z

Cleaned up that junk. Changes for Swift 1.2 are rebased on top of master. All changes should go in master first and then swift1.2 should be rebased onto of that. Any changes specific to Swift1.2 can go straight into the Swift1.2 branch.