Open ghost opened 10 years ago
When you fork, you don't have to change all the import statements.
Use 'go get github.com/conformal/gotk3' as you normally would, and then in your new repo do the following:
$ git remote set-url origin ssh://github.com/gmcbay/gotk3
As it stands, this commit shouldn't be pulled because you've changed all the import statements to no longer point to this repository.
I'd also like you add you typically want to add an upstream remote as well.
$ go get github.com/conformal/gotk3
$ cd $GOPATH/src/github.com/conformal/gotk3
$ git remote set-url origin ssh://github.com/gmcbay/gotk3
$ git remote add upstream https://github.com/conformal/gotk3
Now you can simply create and work on branches while staying synced with upstream like so:
$ git checkout master
$ git pull upstream master
$ git checkout -b new_feature
(hack hack hack commit)
$ git push origin new_feature
(create the pull request)
The key point is to never work directly on master otherwise you'll diverge from upstream. Keep your master synced with upstream, create a new branch for all of your work, periodically checkout master and pull in the latest upstream changes, then go back to your branch, rebase it on the latest master to integrate the changes while fixing any merge conflicts during the rebase if there are any.
...