| ... | ... | @@ -110,38 +110,3 @@ Green labels designate type and state of the issue (Doing, Review, QA needed, et |
|
|
|
Red labels are for things that should stand out. Currently there's one label: bug.
|
|
|
|
|
|
|
|
This is just a proposal. Tomek's idea was to use dark colors for important things and light colors for less important aspects. If you don't like it, we can come up with an alternative naming/coloring scheme. This is working well in Kea project. |
|
|
|
|
|
|
|
## Working with multiple repositories (optional)
|
|
|
|
|
|
|
|
Very infrequently we'll need to access repos other than the official public one. Here's the list of optional ones, with some explanation why we could possibly need to use them.
|
|
|
|
|
|
|
|
* **trac** - We migrated to gitlab in 2018 and copied over all branches. If did some pushes to trac **after** you were supposed to do everything in trac, here's how you can still access it. ```git remote add trac ssh://tomasz@git.kea.isc.org/git/kea```
|
|
|
|
* **github** - We have a public clone of our repo on github. While we prefer users to send MRs on gitlab, some of thmem send PRs on github. ```git remote add github https://github.com/isc-projects/kea```
|
|
|
|
* **private** - When we're dealing with code changes that must not be public for a while, we use private repo. In general, it's easier to set up separate repo copy for this, but if you want to do everything on one repo, you can ```git remote add private git@gitlab.isc.org:isc-private/kea.git```
|
|
|
|
|
|
|
|
Here are a couple commands that may be useful during transition (trac->gitlab) period. However, they are useful if you happen to work with multiple repositories (such as processing pull request from github or working with internal repo).
|
|
|
|
|
|
|
|
This will pull the changes from private repo
|
|
|
|
```
|
|
|
|
git fetch private
|
|
|
|
```
|
|
|
|
|
|
|
|
To list your local branches with the tracking branches on remote repo:
|
|
|
|
```
|
|
|
|
git branch -vv
|
|
|
|
```
|
|
|
|
|
|
|
|
To list remote repos you are set to work with:
|
|
|
|
```
|
|
|
|
git remote -v
|
|
|
|
```
|
|
|
|
|
|
|
|
To set that your local branch should trac a remote branch, use:
|
|
|
|
```
|
|
|
|
git branch -u remote_repo/remote_branch local_branch
|
|
|
|
```
|
|
|
|
|
|
|
|
Fun fact: `git pull` is really a shortcut to `git pull origin`. You can do `git pull private` or `git pull github`. The pull itself does two commands: `git fetch origin` and `git merge master origin/master`.
|
|
|
|
|
|
|
|
Finally, if you can't be bothered anymore and want to get rid of this multiple repos nonsense, do this:
|
|
|
|
`git remote remove trac`. It will unassociate your local copy with remote repo. |
|
|
\ No newline at end of file |
