Git usage in the dpkg team


Generic recommendations

First line should be a small summary

This is the long description of the change. Leave a blank
line between the summary line and the long description.

How to release

For translators

If the git push fails, redo the command git fetch && git rebase origin/master and try again. Note that git rebase can be interrupted if there's a conflict between your work and the changes made on the remote repository. In that case, fix the conflicts by editing the conflicted files, then git add <conflicted files> and ask the rebase process to continue with git rebase --continue. Once it's over, git push should work.