Merge changes by others repos

Question

Merge changes by others repos

hussani opened this issue 11 years ago · comments

With the conflict generated by me not send PR to root, what you thing about reset your repo to this commit and merge the changes by git pull?
Actually exists other repo on constant updates, you can pull the changes from there too.
We need to know if the ours project will remain following the same path, because it will become unfeasible to maintain a sync it when we take different paths.
You think of any changelog or something?

James Brooks · Answer 1 · Sun Jul 14 2013 15:58:28 GMT+0800 (China Standard Time)

I'm happy to rollback my changes, merge yours and then put my new changes back in.

If you're unhappy with the colours, or whatever, then you should rename your project to something else, as the Oblivion theme originates from TextMate. I like your new colours and they're not too far from the original, are they?

James Brooks · Answer 2 · Fri Sep 13 2013 20:31:00 GMT+0800 (China Standard Time)

@hussani any further decisions on this?

Hussani Oliveira · Answer 3 · Sat Sep 14 2013 07:04:35 GMT+0800 (China Standard Time)

Oh, God!
I'm sorry for late answer.

Do you can merge my modifications?

I will sync my repo with your, after it, i will create a other fork with my personal changes ( the colors basically).
Any feature change, i commit in your fork.

Sound good for you?

For me appear the most practice solution.

James Brooks · Answer 4 · Mon Sep 16 2013 18:13:02 GMT+0800 (China Standard Time)

I've merged everything that your fork and others had added.

What we could do is use my repo as the main source for Oblivion, then include several variations, like "Oblivion Light" or whatever, that way you still get your own colour scheme and it originates from the main source of Oblivion.

I can add you as a developer on this repository, then you can add your variation to it. We'll change Package Control afterwards. How does that sound?

Hussani Oliveira · Answer 5 · Tue Sep 17 2013 03:00:12 GMT+0800 (China Standard Time)

Nice!

Is time to change the Package Control repositories.json and create another repo for my personal changes.
Give me 2 days to sync repos and open a PR on Package Control changing Oblivion to your repo and adding my new repo.

James Brooks · Answer 6 · Tue Sep 17 2013 03:04:11 GMT+0800 (China Standard Time)

Okay, you're now a collaborator. When you push your changes, put them into a new file 😄

Hussani Oliveira · Answer 7 · Tue Sep 17 2013 04:49:02 GMT+0800 (China Standard Time)

Thanks for all!
=D

James Brooks · Answer 8 · Tue Sep 17 2013 16:06:51 GMT+0800 (China Standard Time)

@hussani, once your customised version is in the repository, we can go about changing Package Control so that your version is automatically installed through this repository.