All geek questions in one place

Tracking other peoples projects with git

Assuming Project A uses git as its SCM. I cloned their repos, making changes to suit my needs, after which I can still extract updates from my repo and save my changes?

+3
source share
3 answers

The real good way to do this in git is to "recreate" your changes. What does this mean, instead of combining updates from your own repo into your changes, rewinds (cancels) all your changes, makes your changes to your branch (so everything is beautiful and linear), and then “repeats” your changes on on top of them.

This leads to the fact that your changes always basically consist of a series of “patches” on top of the repo that you follow (instead of your changes alternating with the changes when you re-move through the history).

+5
source

I try to build a branch for my changes and periodically reinstall it on top of the code above.

+3
source

Yes. Conflicting changes will be merged, which is basically the point of a good DVCS .

+1
source

Source: https://habr.com/ru/post/1709457/

More articles:


All Articles