skybuck2000 <skybuck2...@hotmail.com> writes:
Here is a "real-world" example: The original repository is this one: https://github.com/PascalCoin/PascalCoin My restructured repository is this one: https://github.com/SkybuckFlying/PascalCoinRestructured
I only took a quick glance at the two repositories, but it seems you are in a situation where
1. You have a branch with major changes (https://github.com/SkybuckFlying/PascalCoinRestructured/commit/b6eb90bbb95c40494838a61b0e52c3dc62ab508b has >10k lines that are changed across 84 files!), and
2. your branch has lived for a long time (3 years), and 3. your branch is 3 years behind the upstream master branch. I can't help but feel a little sorry for you.Maybe that https://github.com/mhagger/git-imerge can help you out of the predicament you've put yourself in.
/M -- Magnus Therning OpenPGP: 0x927912051716CE39 email: mag...@therning.org @magthe@mastodon.technology http://magnus.therning.org/Only put off until tomorrow what you are willing to die having left
undone.
— Pablo Picasso
--
You received this message because you are subscribed to the Google Groups "Git for
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/git-users/878rz5yz7n.fsf%40therning.org.
signature.asc
Description: PGP signature
