Things I learned in Git today…
- git pull upstream doesn’t pull upstream changes. git pull upstream master does.
- As a result of this, and of changing files without being 100% aware of which branch I’m in, I learned than on a conflict, you can use git checkout –theirs to pick the file that you want to use, so that you can commit your changes.
The learning continues…
No comments:
Post a Comment