Assuming that project A is using git as its SCM. I clone their repo make changes suiting my needs, after that can i still pull updates from their repo and keep my changes?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Assuming that project A is using git as its SCM. I clone their repo make changes suiting my needs, after that can i still pull updates from their repo and keep my changes?
A real nice way of doing this in git is to “rebase” your changes. What this does, instead of merging the updates from “their” repo into your changes, is it rewinds (undoes) all of your changes, puts their changes into your branch (so everything is nice and linear) and then “replays” your changes on top of theirs.
This results in your changes always basically being a series of “patches” on top of the repo you are following (instead of having your changes interleaved with their changes as you move back through the history).