3 ms·
Ok, so he made changes you wanted to make but didn't get around to? Simple solution: git pull ...
by yummyfajitas 17y ago
Ok, so he made changes you wanted to make but didn't get around to? Simple solution:
git pull ...
- tedunangst 17y agoAre the changes all compatible? Or are some of them incompatible for trivial reasons because "it's a fork, no reason to be compatible"?
- yummyfajitas 17y agoWhile I was being a little glib, it probably won't be that difficult to incorporate some or all of the changes. Certainly easier than redoing them.
- jrockway 17y agoYou should really rebase, so as not to clutter up the history with meaningless merge commits. In the author's case, he said he abandoned the project (or wasn't working on it), so it should just be a fast-forward.