On Thu, Aug 12, 2010 at 1:33 PM, Bruno Wolff III <bruno(a)wolff.to> wrote:
For a simple fix, I would use git clone to get a local copy of the
repo if I didn't already have one. Otherwise I would use git pull to get
in sync with upstream changes.
Right, this is a good practice especially if you have patches or
something you have changed over a period of a few days, like say 6
patches you have been testing locally over a period of 3 days or so.
Then git commit -a commits all of the local changes you have made
locally.
Aha. So git commit -a actually syncs your local git checkout to say that
when you want to push, the local changes actually should remain. Ok.
Then git push pushes the changes upstream. If something changed
upstream
then this will fail. I am not sure off hand the best way to work
around it. But there should be something that is easy.
I am pretty sure there is a
gitmerge tool.
Check this section if it seems correct:
https://fedoraproject.org/wiki/Using_Fedora_GIT#Using_git_mergetool_to_re...
For fedpkg, I am using that and a mixture of native git commands to
do
work. But I haven't really settled on a process yet.
I would agree fedpkg isn't fully featured yet.
Will keep this message for reference.