Ticket #302 (reopened defect)
changelog prepare fails with git
|Reported by:||murrayc||Owned by:||thomas|
For instance, after doing a checkout (clone) of cairomm, and making some changes, I get the following error. Maybe moap should default to mentioning "origin" or some other obscure git thing.
murrayc@murrayc-x61:~/checkouts/gnome224/cairomm$ moap changelog prepare Updating ChangeLog? from Git repository. Could not update ChangeLog?: You asked me to pull without telling me which branch you want to merge with, and 'branch.master.merge' in your configuration file does not tell me either. Please name which branch you want to merge on the command line and try again (e.g. 'git pull <repository> <refspec>'). See git-pull(1) for details on the refspec.
If you often merge with the same branch, you may want to configure the following variables in your configuration file:
branch.master.remote = <nickname> branch.master.merge = <remote-ref> remote.<nickname>.url = <url> remote.<nickname>.fetch = <refspec>
See git-config(1) for details.
- Status changed from closed to reopened
- Resolution fixed deleted