Git Update fork of an open source project without losing my modifications
I have made a copy from a git repository from an open source project (git clone) and then I add it some custom developments (like adding custom authenticating, logo, new features...). In the meantime, a new release of the open source has been made with new features and fix and I would like to update my local repo without losing my custom dev.
I have already try to generate git patch for every commit that I want to apply in the new version that I have already cloned in local:
git --git-dir= format-patch -1 commit_id
But I have a huge number of conflicts that I have to fix manually.
I don't know if there is a better way to do it! So I would like how would you do it ?
Thanks you
git github
asked Nov 20 at 11:01
Hadria Mehdi
134
add a comment |
I have made a copy from a git repository from an open source project (git clone) and then I add it some custom developments (like adding custom authenticating, logo, new features...). In the meantime, a new release of the open source has been made with new features and fix and I would like to update my local repo without losing my custom dev.
I have already try to generate git patch for every commit that I want to apply in the new version that I have already cloned in local:
git --git-dir= format-patch -1 commit_id
But I have a huge number of conflicts that I have to fix manually.
I don't know if there is a better way to do it! So I would like how would you do it ?
Thanks you
git github
asked Nov 20 at 11:01
Hadria Mehdi
134
add a comment |
I have made a copy from a git repository from an open source project (git clone) and then I add it some custom developments (like adding custom authenticating, logo, new features...). In the meantime, a new release of the open source has been made with new features and fix and I would like to update my local repo without losing my custom dev.
I have already try to generate git patch for every commit that I want to apply in the new version that I have already cloned in local:
git --git-dir= format-patch -1 commit_id
But I have a huge number of conflicts that I have to fix manually.
I don't know if there is a better way to do it! So I would like how would you do it ?
Thanks you
git github
asked Nov 20 at 11:01
Hadria Mehdi
134
I have made a copy from a git repository from an open source project (git clone) and then I add it some custom developments (like adding custom authenticating, logo, new features...). In the meantime, a new release of the open source has been made with new features and fix and I would like to update my local repo without losing my custom dev.
I have already try to generate git patch for every commit that I want to apply in the new version that I have already cloned in local:
git --git-dir= format-patch -1 commit_id
But I have a huge number of conflicts that I have to fix manually.
I don't know if there is a better way to do it! So I would like how would you do it ?
Thanks you
git github
git github
asked Nov 20 at 11:01
Hadria Mehdi
134
asked Nov 20 at 11:01
Hadria Mehdi
134
asked Nov 20 at 11:01
Hadria Mehdi
134
asked Nov 20 at 11:01
Hadria Mehdi
134
asked Nov 20 at 11:01
Hadria Mehdi
134
134
add a comment |
add a comment |
active
oldest
votes
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53391560%2fgit-update-fork-of-an-open-source-project-without-losing-my-modifications%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
active
oldest
votes
active
oldest
votes
active
oldest
votes
active
oldest
votes
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Some of your past answers have not been well-received, and you're in danger of being blocked from answering.
Please pay close attention to the following guidance:
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53391560%2fgit-update-fork-of-an-open-source-project-without-losing-my-modifications%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
