| 1 |
> * Fernando Rodriguez <frodriguez.developer@×××××××.com> [150829 12:59]: |
| 2 |
> On Friday, August 28, 2015 2:24:37 PM Rich Freeman wrote: |
| 3 |
> > Those who wish to use git can do so, and I'd encourage people to try. |
| 4 |
> > It really does have a lot of advantages. Oh, and it makes it really |
| 5 |
> > easy to contribute patches/etc (just edit whatever you want in |
| 6 |
> > /usr/portage and type git diff). |
| 7 |
> |
| 8 |
> I wouldn't advise that on the portage tree because if you edit any files under |
| 9 |
> version control git will refuse to pull new changes until you either commit |
| 10 |
> the changes or undo them by checking out the file. |
| 11 |
|
| 12 |
It will still pull but you'll potentially have conflicts to resolve. |
| 13 |
|
| 14 |
A bad idea in any case. |
| 15 |
|
| 16 |
Todd |
| 17 |
|
| 18 |
Now many repositories use git, and I need to know how to make changes to some files, hopefully a small number, but still be able to update with git. |
| 19 |
|
| 20 |
I keep the modifications somewhere for safekeeping, as well as the originals, but would want to see the updated files straight before remaking my modifications. |
| 21 |
|
| 22 |
I looked through man pages, git pull --rebase didn't work; I got error messages. Should I do "git reset" or should I "git checkout" each modified file one-by-one before "git pull"? |
| 23 |
|
| 24 |
There is a lot in git, learning git all the way through looks like a tall order. |
| 25 |
|
| 26 |
Tom |
Archives